meson.build

@@ -2820,6 +2820,8 @@ install_data('LICENSE.GPL2',
 install_subdir('LICENSES',
                install_dir : docdir)
 
+install_emptydir(systemdstatedir)
+
 #####################################################################
 
 # Ensure that changes to the docs/ directory do not break the

mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf

@@ -9,5 +9,5 @@ Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
         GIT_SUBDIR=debian
         GIT_BRANCH=debian/master
-        GIT_COMMIT=ecec6127927ca59726e3d3535a2b2344f585cf74
+        GIT_COMMIT=6f4d90be5cb4075954f0a36653105e586a9a1fa9
         PKG_SUBDIR=debian

src/ask-password/ask-password.c

@@ -282,10 +282,10 @@ typedef struct MethodAskParameters {
 static int vl_method_ask(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
 
         static const sd_json_dispatch_field dispatch_table[] = {
-                { "message",      SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, message),       SD_JSON_STRICT },
+                { "message",      SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, message),       0 },
-                { "keyname",      SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, keyring),       SD_JSON_STRICT },
+                { "keyname",      SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, keyring),       0 },
-                { "icon",         SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, icon),          SD_JSON_STRICT },
+                { "icon",         SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, icon),          0 },
-                { "id",           SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, id),            SD_JSON_STRICT },
+                { "id",           SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string, offsetof(MethodAskParameters, id),            0 },
                 { "timeoutUSec",  _SD_JSON_VARIANT_TYPE_INVALID, sd_json_dispatch_uint64,       offsetof(MethodAskParameters, timeout_usec),  0 },
                 { "untilUSec",    _SD_JSON_VARIANT_TYPE_INVALID, sd_json_dispatch_uint64,       offsetof(MethodAskParameters, until_usec),    0 },
                 { "acceptCached", SD_JSON_VARIANT_BOOLEAN,       sd_json_dispatch_tristate,     offsetof(MethodAskParameters, accept_cached), 0 },

src/ask-password/meson.build

@@ -7,6 +7,3 @@ executables += [
                 'sources' : files('ask-password.c'),
         },
 ]
-
-install_data('io.systemd.ask-password.policy',
-             install_dir : polkitpolicydir)

src/import/import-generator.c

@@ -357,11 +357,9 @@ static int transfer_generate(const Transfer *t) {
                         arg_failure_action);
 
         if (t->class == IMAGE_SYSEXT)
-                fprintf(f, "Before=systemd-sysext%s.service\n",
+                fputs("Before=systemd-sysext.service\n", f);
-                        in_initrd() ? "-initrd" : "");
         else if (t->class == IMAGE_CONFEXT)
-                fprintf(f, "Before=systemd-confext%s.service\n",
+                fputs("Before=systemd-confext.service\n", f);
-                        in_initrd() ? "-initrd" : "");
 
         /* Assume network resource unless URL is file:// */
         if (!file_url_is_valid(t->remote))

src/shared/ask-password-api.c

@@ -1004,10 +1004,8 @@ int ask_password_agent(
                         goto finish;
                 }
 
-                if (req->hup_fd >= 0 && pollfd[hup_fd_idx].revents & POLLHUP) {
+                if (req->hup_fd >= 0 && pollfd[hup_fd_idx].revents & POLLHUP)
-                        r = -ECONNRESET;
+                        return -ECONNRESET;
-                        goto finish;
-                }
 
                 if (inotify_fd >= 0 && pollfd[inotify_idx].revents != 0) {
                         (void) flush_fd(inotify_fd);

src/shared/install.c

@@ -3239,13 +3239,7 @@ int unit_file_get_state(
         return unit_file_lookup_state(scope, &lp, name, ret);
 }
 
-int unit_file_exists_full(
+int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char *name, char **ret_path) {
-                RuntimeScope scope,
-                const LookupPaths *lp,
-                bool follow,
-                const char *name,
-                char **ret_path) {
-
         _cleanup_(install_context_done) InstallContext c = {
                 .scope = scope,
         };
@@ -3262,7 +3256,7 @@ int unit_file_exists_full(
                         &c,
                         lp,
                         name,
-                        follow ? SEARCH_FOLLOW_CONFIG_SYMLINKS : 0,
+                        /* flags= */ 0,
                         ret_path ? &info : NULL,
                         /* changes= */ NULL,
                         /* n_changes= */ NULL);

src/shared/install.h

@@ -181,15 +181,9 @@ int unit_file_lookup_state(
 
 int unit_file_get_state(RuntimeScope scope, const char *root_dir, const char *filename, UnitFileState *ret);
 
-int unit_file_exists_full(
+int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char *name, char **ret_path);
-                RuntimeScope scope,
-                const LookupPaths *lp,
-                bool follow,
-                const char *name,
-                char **ret_path);
-
 static inline int unit_file_exists(RuntimeScope scope, const LookupPaths *lp, const char *name) {
-        return unit_file_exists_full(scope, lp, false, name, NULL);
+        return unit_file_exists_full(scope, lp, name, NULL);
 }
 
 int unit_file_get_list(RuntimeScope scope, const char *root_dir, char * const *states, char * const *patterns, Hashmap **ret);

src/ssh-generator/ssh-generator.c

@@ -475,10 +475,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
                 return r;
 
         _cleanup_free_ char *found_sshd_template_unit = NULL;
-        r = unit_file_exists_full(RUNTIME_SCOPE_SYSTEM, &lp,
+        r = unit_file_exists_full(RUNTIME_SCOPE_SYSTEM, &lp, "sshd@.service", &found_sshd_template_unit);
-                                  /* follow = */ true,
-                                  "sshd@.service",
-                                  &found_sshd_template_unit);
         if (r < 0)
                 return log_error_errno(r, "Unable to detect if sshd@.service exists: %m");