docs/ENVIRONMENT.md

@@ -90,10 +90,6 @@ systemctl:
 
 * `$SYSTEMCTL_SKIP_SYSV=1` — if set, do not call out to SysV compatibility hooks.
 
-* `$SYSTEMD_LOG_SECCOMP=1` — if set, system calls blocked by seccomp filtering,
-  for example in systemd-nspawn, will be logged to the audit log, if the current
-  kernel version supports this.
-
 systemd-nspawn:
 
 * `$SYSTEMD_NSPAWN_UNIFIED_HIERARCHY=1` — if set, force nspawn into unified

man/systemd.exec.xml

@@ -149,53 +149,11 @@
         <term><varname>RootImageOptions=</varname></term>
 
         <listitem><para>Takes a comma-separated list of mount options that will be used on disk images specified by
-        <varname>RootImage=</varname>. Optionally a partition name can be prefixed, followed by colon, in
+        <varname>RootImage=</varname>. Optionally a partition number can be prefixed, followed by colon, in
-        case the image has multiple partitions, otherwise partition name <literal>root</literal> is implied.
+        case the image has multiple partitions, otherwise partition number 0 is implied.
         Options for multiple partitions can be specified in a single line with space separators. Assigning an empty
-        string removes previous assignments. Duplicated options are ignored. For a list of valid mount options, please
+        string removes previous assignments. For a list of valid mount options, please refer to
-        refer to <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+        <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
-
-        <para>Valid partition names follow the <ulink url="https://systemd.io/DISCOVERABLE_PARTITIONS">Discoverable
-        Partitions Specification</ulink>.</para>
-
-        <table>
-          <title>Accepted partition names</title>
-
-          <tgroup cols='1'>
-            <colspec colname='partition' />
-            <thead>
-              <row>
-                <entry>Partition Name</entry>
-              </row>
-            </thead>
-            <tbody>
-              <row>
-                <entry>root</entry>
-              </row>
-              <row>
-                <entry>root-secondary</entry>
-              </row>
-              <row>
-                <entry>home</entry>
-              </row>
-              <row>
-                <entry>srv</entry>
-              </row>
-              <row>
-                <entry>esp</entry>
-              </row>
-              <row>
-                <entry>xbootldr</entry>
-              </row>
-              <row>
-                <entry>tmp</entry>
-              </row>
-              <row>
-                <entry>var</entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </table>
 
         <xi:include href="system-only.xml" xpointer="singular"/></listitem>
       </varlistentry>
@@ -310,19 +268,13 @@
         system hierarchy from a block device node or loopback file, but the destination directory can be
         specified as well as mount options. This option expects a whitespace separated list of mount
         definitions. Each definition consists of a colon-separated tuple of source path and destination
-        definitions, optionally followed by another colon and a list of mount options.</para>
+        directory. Each mount definition may be prefixed with <literal>-</literal>, in which case it will be
-
-        <para>Mount options may be defined as a single comma-separated list of options, in which case they
-        will be implicitly applied to the root partition on the image, or a series of colon-separated tuples
-        of partition name and mount options. Valid partition names and mount options are the same as for
-        <varname>RootImageOptions=</varname> setting described above.</para>
-
-        <para>Each mount definition may be prefixed with <literal>-</literal>, in which case it will be
         ignored when its source path does not exist. The source argument is a path to a block device node or
         regular file. If source or destination contain a <literal>:</literal>, it needs to be escaped as
-        <literal>\:</literal>. The device node or file system image file needs to follow the same rules as
+        <literal>\:</literal>.
-        specified for <varname>RootImage=</varname>. Any mounts created with this option are specific to the
+        The device node or file system image file needs to follow the same rules as specified
-        unit, and are not visible in the host's mount table.</para>
+        for <varname>RootImage=</varname>. Any mounts created with this option are specific to the unit, and
+        are not visible in the host's mount table.</para>
 
         <para>These settings may be used more than once, each usage appends to the unit's list of mount
         paths. If the empty string is assigned, the entire list of mount paths defined prior to this is

src/core/dbus-execute.c

@@ -802,14 +802,12 @@ static int property_get_root_image_options(
         assert(property);
         assert(reply);
 
-        r = sd_bus_message_open_container(reply, 'a', "(ss)");
+        r = sd_bus_message_open_container(reply, 'a', "(us)");
         if (r < 0)
                 return r;
 
         LIST_FOREACH(mount_options, m, c->root_image_options) {
-                r = sd_bus_message_append(reply, "(ss)",
+                r = sd_bus_message_append(reply, "(us)", m->partition_number, m->options);
-                                          partition_designator_to_string(m->partition_designator),
-                                          m->options);
                 if (r < 0)
                         return r;
         }
@@ -834,39 +832,18 @@ static int property_get_mount_images(
         assert(property);
         assert(reply);
 
-        r = sd_bus_message_open_container(reply, 'a', "(ssba(ss))");
+        r = sd_bus_message_open_container(reply, 'a', "(ssb)");
         if (r < 0)
                 return r;
 
         for (size_t i = 0; i < c->n_mount_images; i++) {
-                MountOptions *m;
-
-                r = sd_bus_message_open_container(reply, SD_BUS_TYPE_STRUCT, "ssba(ss)");
-                if (r < 0)
-                        return r;
                 r = sd_bus_message_append(
-                                reply, "ssb",
+                                reply, "(ssb)",
                                 c->mount_images[i].source,
                                 c->mount_images[i].destination,
                                 c->mount_images[i].ignore_enoent);
                 if (r < 0)
                         return r;
-                r = sd_bus_message_open_container(reply, 'a', "(ss)");
-                if (r < 0)
-                        return r;
-                LIST_FOREACH(mount_options, m, c->mount_images[i].mount_options) {
-                        r = sd_bus_message_append(reply, "(ss)",
-                                                  partition_designator_to_string(m->partition_designator),
-                                                  m->options);
-                        if (r < 0)
-                                return r;
-                }
-                r = sd_bus_message_close_container(reply);
-                if (r < 0)
-                        return r;
-                r = sd_bus_message_close_container(reply);
-                if (r < 0)
-                        return r;
         }
 
         return sd_bus_message_close_container(reply);
@@ -914,13 +891,13 @@ const sd_bus_vtable bus_exec_vtable[] = {
         SD_BUS_PROPERTY("WorkingDirectory", "s", property_get_working_directory, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RootDirectory", "s", NULL, offsetof(ExecContext, root_directory), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RootImage", "s", NULL, offsetof(ExecContext, root_image), SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("RootImageOptions", "a(ss)", property_get_root_image_options, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("RootImageOptions", "a(us)", property_get_root_image_options, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RootHash", "ay", property_get_root_hash, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RootHashPath", "s", NULL, offsetof(ExecContext, root_hash_path), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RootHashSignature", "ay", property_get_root_hash_sig, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RootHashSignaturePath", "s", NULL, offsetof(ExecContext, root_hash_sig_path), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("RootVerity", "s", NULL, offsetof(ExecContext, root_verity), SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("MountImages", "a(ssba(ss))", property_get_mount_images, 0, SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("MountImages", "a(ssb)", property_get_mount_images, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("OOMScoreAdjust", "i", property_get_oom_score_adjust, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("CoredumpFilter", "t", property_get_coredump_filter, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("Nice", "i", property_get_nice, 0, SD_BUS_VTABLE_PROPERTY_CONST),
@@ -1361,74 +1338,6 @@ static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(capability, "t", uint64_t, uint6
 static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(namespace_flag, "t", uint64_t, unsigned long, "%" PRIu64, namespace_flags_to_string);
 static BUS_DEFINE_SET_TRANSIENT_TO_STRING(mount_flags, "t", uint64_t, unsigned long, "%" PRIu64, mount_propagation_flags_to_string_with_check);
 
-/* ret_format_str is an accumulator, so if it has any pre-existing content, new options will be appended to it */
-static int read_mount_options(sd_bus_message *message, sd_bus_error *error, MountOptions **ret_options, char **ret_format_str, const char *separator) {
-        _cleanup_(mount_options_free_allp) MountOptions *options = NULL;
-        _cleanup_free_ char *format_str = NULL;
-        const char *mount_options, *partition;
-        int r;
-
-        assert(message);
-        assert(ret_options);
-        assert(ret_format_str);
-        assert(separator);
-
-        r = sd_bus_message_enter_container(message, 'a', "(ss)");
-        if (r < 0)
-                return r;
-
-        while ((r = sd_bus_message_read(message, "(ss)", &partition, &mount_options)) > 0) {
-                _cleanup_free_ char *previous = NULL, *escaped = NULL;
-                _cleanup_free_ MountOptions *o = NULL;
-                int partition_designator;
-
-                if (chars_intersect(mount_options, WHITESPACE))
-                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS,
-                                                "Invalid mount options string, contains whitespace character(s): %s", mount_options);
-
-                partition_designator = partition_designator_from_string(partition);
-                if (partition_designator < 0)
-                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid partition name %s", partition);
-
-                /* Need to store them in the unit with the escapes, so that they can be parsed again */
-                escaped = shell_escape(mount_options, ":");
-                if (!escaped)
-                        return -ENOMEM;
-
-                previous = TAKE_PTR(format_str);
-                format_str = strjoin(previous, previous ? separator : "", partition, ":", escaped);
-                if (!format_str)
-                        return -ENOMEM;
-
-                o = new(MountOptions, 1);
-                if (!o)
-                        return -ENOMEM;
-                *o = (MountOptions) {
-                        .partition_designator = partition_designator,
-                        .options = strdup(mount_options),
-                };
-                if (!o->options)
-                        return -ENOMEM;
-                LIST_APPEND(mount_options, options, TAKE_PTR(o));
-        }
-        if (r < 0)
-                return r;
-
-        r = sd_bus_message_exit_container(message);
-        if (r < 0)
-                return r;
-
-        if (!LIST_IS_EMPTY(options)) {
-                char *final = strjoin(*ret_format_str, !isempty(*ret_format_str) ? separator : "", format_str);
-                if (!final)
-                        return -ENOMEM;
-                free_and_replace(*ret_format_str, final);
-                LIST_JOIN(mount_options, *ret_options, options);
-        }
-
-        return 0;
-}
-
 int bus_exec_context_set_transient_property(
                 Unit *u,
                 ExecContext *c,
@@ -1462,8 +1371,39 @@ int bus_exec_context_set_transient_property(
         if (streq(name, "RootImageOptions")) {
                 _cleanup_(mount_options_free_allp) MountOptions *options = NULL;
                 _cleanup_free_ char *format_str = NULL;
+                const char *mount_options;
+                unsigned partition_number;
 
-                r = read_mount_options(message, error, &options, &format_str, " ");
+                r = sd_bus_message_enter_container(message, 'a', "(us)");
+                if (r < 0)
+                        return r;
+
+                while ((r = sd_bus_message_read(message, "(us)", &partition_number, &mount_options)) > 0) {
+                        _cleanup_free_ char *previous = TAKE_PTR(format_str);
+                        _cleanup_free_ MountOptions *o = NULL;
+
+                        if (chars_intersect(mount_options, WHITESPACE))
+                                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS,
+                                                        "Invalid mount options string, contains whitespace character(s): %s", mount_options);
+
+                        if (asprintf(&format_str, "%s%s%u:%s", strempty(previous), previous ? " " : "", partition_number, mount_options) < 0)
+                                return -ENOMEM;
+
+                        o = new(MountOptions, 1);
+                        if (!o)
+                                return -ENOMEM;
+                        *o = (MountOptions) {
+                                .partition_number = partition_number,
+                                .options = strdup(mount_options),
+                        };
+                        if (!o->options)
+                                return -ENOMEM;
+                        LIST_APPEND(mount_options, options, TAKE_PTR(o));
+                }
+                if (r < 0)
+                        return r;
+
+                r = sd_bus_message_exit_container(message);
                 if (r < 0)
                         return r;
 
@@ -2998,23 +2938,13 @@ int bus_exec_context_set_transient_property(
                 char *source, *destination;
                 int permissive;
 
-                r = sd_bus_message_enter_container(message, 'a', "(ssba(ss))");
+                r = sd_bus_message_enter_container(message, 'a', "(ssb)");
                 if (r < 0)
                         return r;
 
-                for (;;) {
+                while ((r = sd_bus_message_read(message, "(ssb)", &source, &destination, &permissive)) > 0) {
-                        _cleanup_(mount_options_free_allp) MountOptions *options = NULL;
-                        _cleanup_free_ char *source_escaped = NULL, *destination_escaped = NULL;
                         char *tuple;
 
-                        r = sd_bus_message_enter_container(message, 'r', "ssba(ss)");
-                        if (r < 0)
-                                return r;
-
-                        r = sd_bus_message_read(message, "ssb", &source, &destination, &permissive);
-                        if (r <= 0)
-                                break;
-
                         if (!path_is_absolute(source))
                                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Source path %s is not absolute.", source);
                         if (!path_is_normalized(source))
@@ -3024,37 +2954,15 @@ int bus_exec_context_set_transient_property(
                         if (!path_is_normalized(destination))
                                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Destination path %s is not normalized.", destination);
 
-                        /* Need to store them in the unit with the escapes, so that they can be parsed again */
+                        tuple = strjoin(format_str, format_str ? " " : "", permissive ? "-" : "", source, ":", destination);
-                        source_escaped = shell_escape(source, ":");
-                        if (!source_escaped)
-                                return -ENOMEM;
-                        destination_escaped = shell_escape(destination, ":");
-                        if (!destination_escaped)
-                                return -ENOMEM;
-
-                        tuple = strjoin(format_str,
-                                        format_str ? " " : "",
-                                        permissive ? "-" : "",
-                                        source_escaped,
-                                        ":",
-                                        destination_escaped);
                         if (!tuple)
                                 return -ENOMEM;
                         free_and_replace(format_str, tuple);
 
-                        r = read_mount_options(message, error, &options, &format_str, ":");
-                        if (r < 0)
-                                return r;
-
-                        r = sd_bus_message_exit_container(message);
-                        if (r < 0)
-                                return r;
-
                         r = mount_image_add(&mount_images, &n_mount_images,
                                             &(MountImage) {
                                                     .source = source,
                                                     .destination = destination,
-                                                    .mount_options = options,
                                                     .ignore_enoent = permissive,
                                             });
                         if (r < 0)

src/core/execute.c

@@ -4634,9 +4634,7 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
                 fprintf(f, "%sRootImageOptions:", prefix);
                 LIST_FOREACH(mount_options, o, c->root_image_options)
                         if (!isempty(o->options))
-                                fprintf(f, " %s:%s",
+                                fprintf(f, " %u:%s", o->partition_number, o->options);
-                                        partition_designator_to_string(o->partition_designator),
-                                        o->options);
                 fprintf(f, "\n");
         }
 
@@ -5037,20 +5035,11 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
                         fprintf(f, "%d\n", c->syscall_errno);
         }
 
-        for (i = 0; i < c->n_mount_images; i++) {
+        for (i = 0; i < c->n_mount_images; i++)
-                MountOptions *o;
+                fprintf(f, "%sMountImages: %s%s:%s\n", prefix,
-
-                fprintf(f, "%sMountImages: %s%s:%s%s", prefix,
                         c->mount_images[i].ignore_enoent ? "-": "",
                         c->mount_images[i].source,
-                        c->mount_images[i].destination,
+                        c->mount_images[i].destination);
-                        LIST_IS_EMPTY(c->mount_images[i].mount_options) ? "": ":");
-                LIST_FOREACH(mount_options, o, c->mount_images[i].mount_options)
-                        fprintf(f, "%s:%s",
-                                partition_designator_to_string(o->partition_designator),
-                                o->options);
-                fprintf(f, "\n");
-        }
 }
 
 bool exec_context_maintains_privileges(const ExecContext *c) {

src/core/load-fragment.c

@@ -1429,10 +1429,9 @@ int config_parse_root_image_options(
                 void *userdata) {
 
         _cleanup_(mount_options_free_allp) MountOptions *options = NULL;
-        _cleanup_strv_free_ char **l = NULL;
-        char **first = NULL, **second = NULL;
         ExecContext *c = data;
         const Unit *u = userdata;
+        const char *p = rvalue;
         int r;
 
         assert(filename);
@@ -1445,32 +1444,44 @@ int config_parse_root_image_options(
                 return 0;
         }
 
-        r = strv_split_colon_pairs(&l, rvalue);
+        for (;;) {
-        if (r == -ENOMEM)
+                _cleanup_free_ char *mount_options_resolved = NULL, *first = NULL, *tuple = NULL;
-                return log_oom();
+                const char *mount_options = NULL, *second = NULL;
-        if (r < 0) {
-                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse %s, ignoring: %s", lvalue, rvalue);
-                return 0;
-        }
-
-        STRV_FOREACH_PAIR(first, second, l) {
                 MountOptions *o = NULL;
-                _cleanup_free_ char *mount_options_resolved = NULL;
+                unsigned int partition_number = 0;
-                const char *mount_options = NULL, *partition = "root";
-                int partition_designator;
 
-                /* Format is either 'root:foo' or 'foo' (root is implied) */
+                r = extract_first_word(&p, &tuple, WHITESPACE, EXTRACT_UNQUOTE);
-                if (!isempty(*second)) {
+                if (r == 0)
-                        partition = *first;
+                        break;
-                        mount_options = *second;
+                if (r == -ENOMEM)
-                } else
+                        return log_oom();
-                        mount_options = *first;
+                if (r < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse %s: %s", lvalue, rvalue);
+                        return 0;
+                }
 
-                partition_designator = partition_designator_from_string(partition);
+                second = tuple;
-                if (partition_designator < 0) {
+                r = extract_first_word(&second, &first, ":", EXTRACT_UNQUOTE|EXTRACT_DONT_COALESCE_SEPARATORS);
-                        log_syntax(unit, LOG_ERR, filename, line, SYNTHETIC_ERRNO(EINVAL), "Invalid partition name %s, ignoring", partition);
+                if (r == 0)
+                        continue;
+                if (r == -ENOMEM)
+                        return log_oom();
+                if (r < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse %s: %s", lvalue, rvalue);
                         continue;
                 }
+
+                /* Format is either '0:foo' or 'foo' (0 is implied) */
+                if (!isempty(second) && second[-1] == ':') {
+                        mount_options = second;
+                        r = safe_atou(first, &partition_number);
+                        if (r < 0) {
+                                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse partition number from \"%s\", ignoring: %m", first);
+                                continue;
+                        }
+                } else
+                        mount_options = first;
+
                 r = unit_full_printf(u, mount_options, &mount_options_resolved);
                 if (r < 0) {
                         log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", mount_options);
@@ -1481,10 +1492,10 @@ int config_parse_root_image_options(
                 if (!o)
                         return log_oom();
                 *o = (MountOptions) {
-                        .partition_designator = partition_designator,
+                        .partition_number = partition_number,
                         .options = TAKE_PTR(mount_options_resolved),
                 };
-                LIST_APPEND(mount_options, options, TAKE_PTR(o));
+                LIST_APPEND(mount_options, options, o);
         }
 
         /* empty spaces/separators only */
@@ -4622,9 +4633,10 @@ int config_parse_mount_images(
                 void *data,
                 void *userdata) {
 
+        _cleanup_strv_free_ char **l = NULL;
         ExecContext *c = data;
         const Unit *u = userdata;
-        const char *p = rvalue;
+        char **source = NULL, **destination = NULL;
         int r;
 
         assert(filename);
@@ -4638,31 +4650,23 @@ int config_parse_mount_images(
                 return 0;
         }
 
-        for (;;) {
+        r = strv_split_colon_pairs(&l, rvalue);
-                _cleanup_(mount_options_free_allp) MountOptions *options = NULL;
+        if (r == -ENOMEM)
-                _cleanup_free_ char *first = NULL, *second = NULL, *tuple = NULL;
+                return log_oom();
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse %s, ignoring: %s", lvalue, rvalue);
+                return 0;
+        }
+
+        STRV_FOREACH_PAIR(source, destination, l) {
                 _cleanup_free_ char *sresolved = NULL, *dresolved = NULL;
-                const char *q = NULL;
                 char *s = NULL;
                 bool permissive = false;
 
-                r = extract_first_word(&p, &tuple, NULL, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE);
+                r = unit_full_printf(u, *source, &sresolved);
-                if (r < 0)
-                        return r;
-                if (r == 0)
-                        break;
-
-                q = tuple;
-                r = extract_many_words(&q, ":", EXTRACT_CUNESCAPE|EXTRACT_UNESCAPE_SEPARATORS, &first, &second, NULL);
-                if (r < 0)
-                        return r;
-                if (r == 0)
-                        continue;
-
-                r = unit_full_printf(u, first, &sresolved);
                 if (r < 0) {
                         log_syntax(unit, LOG_ERR, filename, line, r,
-                                   "Failed to resolve unit specifiers in \"%s\", ignoring: %m", first);
+                                   "Failed to resolve unit specifiers in \"%s\", ignoring: %m", *source);
                         continue;
                 }
 
@@ -4676,15 +4680,15 @@ int config_parse_mount_images(
                 if (r < 0)
                         continue;
 
-                if (isempty(second)) {
+                if (isempty(*destination)) {
                         log_syntax(unit, LOG_ERR, filename, line, 0, "Missing destination in %s, ignoring: %s", lvalue, rvalue);
                         continue;
                 }
 
-                r = unit_full_printf(u, second, &dresolved);
+                r = unit_full_printf(u, *destination, &dresolved);
                 if (r < 0) {
                         log_syntax(unit, LOG_ERR, filename, line, r,
-                                        "Failed to resolve specifiers in \"%s\", ignoring: %m", second);
+                                        "Failed to resolve specifiers in \"%s\", ignoring: %m", *destination);
                         continue;
                 }
 
@@ -4692,62 +4696,10 @@ int config_parse_mount_images(
                 if (r < 0)
                         continue;
 
-                for (;;) {
-                        _cleanup_free_ char *partition = NULL, *mount_options = NULL, *mount_options_resolved = NULL;
-                        MountOptions *o = NULL;
-                        int partition_designator;
-
-                        r = extract_many_words(&q, ":", EXTRACT_CUNESCAPE|EXTRACT_UNESCAPE_SEPARATORS, &partition, &mount_options, NULL);
-                        if (r < 0)
-                                return r;
-                        if (r == 0)
-                                break;
-                        /* Single set of options, applying to the root partition/single filesystem */
-                        if (r == 1) {
-                                r = unit_full_printf(u, partition, &mount_options_resolved);
-                                if (r < 0) {
-                                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", first);
-                                        continue;
-                                }
-
-                                o = new(MountOptions, 1);
-                                if (!o)
-                                        return log_oom();
-                                *o = (MountOptions) {
-                                        .partition_designator = PARTITION_ROOT,
-                                        .options = TAKE_PTR(mount_options_resolved),
-                                };
-                                LIST_APPEND(mount_options, options, o);
-
-                                break;
-                        }
-
-                        partition_designator = partition_designator_from_string(partition);
-                        if (partition_designator < 0) {
-                                log_syntax(unit, LOG_ERR, filename, line, SYNTHETIC_ERRNO(EINVAL), "Invalid partition name %s, ignoring", partition);
-                                continue;
-                        }
-                        r = unit_full_printf(u, mount_options, &mount_options_resolved);
-                        if (r < 0) {
-                                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in %s, ignoring: %m", mount_options);
-                                continue;
-                        }
-
-                        o = new(MountOptions, 1);
-                        if (!o)
-                                return log_oom();
-                        *o = (MountOptions) {
-                                .partition_designator = partition_designator,
-                                .options = TAKE_PTR(mount_options_resolved),
-                        };
-                        LIST_APPEND(mount_options, options, o);
-                }
-
                 r = mount_image_add(&c->mount_images, &c->n_mount_images,
                                     &(MountImage) {
                                             .source = s,
                                             .destination = dresolved,
-                                            .mount_options = options,
                                             .ignore_enoent = permissive,
                                     });
                 if (r < 0)

src/core/namespace.c

@@ -73,7 +73,7 @@ typedef struct MountEntry {
         char *options_malloc;
         unsigned long flags;      /* Mount flags used by EMPTY_DIR and TMPFS. Do not include MS_RDONLY here, but please use read_only. */
         unsigned n_followed;
-        LIST_HEAD(MountOptions, image_options);
+        LIST_FIELDS(MountEntry, mount_entry);
 } MountEntry;
 
 /* If MountAPIVFS= is used, let's mount /sys and /proc into the it, but only as a fallback if the user hasn't mounted
@@ -247,7 +247,6 @@ static void mount_entry_done(MountEntry *p) {
         p->path_malloc = mfree(p->path_malloc);
         p->source_malloc = mfree(p->source_malloc);
         p->options_malloc = mfree(p->options_malloc);
-        p->image_options = mount_options_free_all(p->image_options);
 }
 
 static int append_access_mounts(MountEntry **p, char **strv, MountMode mode, bool forcibly_require_prefix) {
@@ -340,7 +339,6 @@ static int append_mount_images(MountEntry **p, const MountImage *mount_images, s
                         .path_const = m->destination,
                         .mode = MOUNT_IMAGES,
                         .source_const = m->source,
-                        .image_options = m->mount_options,
                         .ignore = m->ignore_enoent,
                 };
         }
@@ -927,10 +925,10 @@ static int mount_images(const MountEntry *m) {
         if (r < 0)
                 return log_debug_errno(r, "Failed to create loop device for image: %m");
 
-        r = dissect_image(loop_device->fd, root_hash_decoded, root_hash_size, verity_data, m->image_options, dissect_image_flags, &dissected_image);
+        r = dissect_image(loop_device->fd, root_hash_decoded, root_hash_size, verity_data, NULL, dissect_image_flags, &dissected_image);
         /* No partition table? Might be a single-filesystem image, try again */
         if (!verity_data && r < 0 && r == -ENOPKG)
-                 r = dissect_image(loop_device->fd, root_hash_decoded, root_hash_size, verity_data, m->image_options, dissect_image_flags|DISSECT_IMAGE_NO_PARTITION_TABLE, &dissected_image);
+                 r = dissect_image(loop_device->fd, root_hash_decoded, root_hash_size, verity_data, NULL, dissect_image_flags|DISSECT_IMAGE_NO_PARTITION_TABLE, &dissected_image);
         if (r < 0)
                 return log_debug_errno(r, "Failed to dissect image: %m");
 
@@ -1840,7 +1838,6 @@ MountImage* mount_image_free_many(MountImage *m, size_t *n) {
         for (i = 0; i < *n; i++) {
                 free(m[i].source);
                 free(m[i].destination);
-                mount_options_free_all(m[i].mount_options);
         }
 
         free(m);
@@ -1850,8 +1847,6 @@ MountImage* mount_image_free_many(MountImage *m, size_t *n) {
 
 int mount_image_add(MountImage **m, size_t *n, const MountImage *item) {
         _cleanup_free_ char *s = NULL, *d = NULL;
-        _cleanup_(mount_options_free_allp) MountOptions *options = NULL;
-        MountOptions *i;
         MountImage *c;
 
         assert(m);
@@ -1866,23 +1861,6 @@ int mount_image_add(MountImage **m, size_t *n, const MountImage *item) {
         if (!d)
                 return -ENOMEM;
 
-        LIST_FOREACH(mount_options, i, item->mount_options) {
-                _cleanup_(mount_options_free_allp) MountOptions *o;
-
-                o = new(MountOptions, 1);
-                if (!o)
-                        return -ENOMEM;
-
-                *o = (MountOptions) {
-                        .partition_designator = i->partition_designator,
-                        .options = strdup(i->options),
-                };
-                if (!o->options)
-                        return -ENOMEM;
-
-                LIST_APPEND(mount_options, options, TAKE_PTR(o));
-        }
-
         c = reallocarray(*m, *n + 1, sizeof(MountImage));
         if (!c)
                 return -ENOMEM;
@@ -1892,7 +1870,6 @@ int mount_image_add(MountImage **m, size_t *n, const MountImage *item) {
         c[(*n) ++] = (MountImage) {
                 .source = TAKE_PTR(s),
                 .destination = TAKE_PTR(d),
-                .mount_options = TAKE_PTR(options),
                 .ignore_enoent = item->ignore_enoent,
         };
 

src/core/namespace.h

@@ -9,6 +9,7 @@ typedef struct NamespaceInfo NamespaceInfo;
 typedef struct BindMount BindMount;
 typedef struct TemporaryFileSystem TemporaryFileSystem;
 typedef struct MountImage MountImage;
+typedef struct MountEntry MountEntry;
 
 #include <stdbool.h>
 
@@ -76,7 +77,6 @@ struct TemporaryFileSystem {
 struct MountImage {
         char *source;
         char *destination;
-        LIST_HEAD(MountOptions, mount_options);
         bool ignore_enoent;
 };
 

src/nspawn/nspawn-oci.c

@@ -1695,9 +1695,6 @@ static int oci_seccomp_arch_from_string(const char *name, uint32_t *ret) {
                 { "SCMP_ARCH_PPC",         SCMP_ARCH_PPC         },
                 { "SCMP_ARCH_PPC64",       SCMP_ARCH_PPC64       },
                 { "SCMP_ARCH_PPC64LE",     SCMP_ARCH_PPC64LE     },
-#ifdef SCMP_ARCH_RISCV64
-                { "SCMP_ARCH_RISCV64",     SCMP_ARCH_RISCV64     },
-#endif
                 { "SCMP_ARCH_S390",        SCMP_ARCH_S390        },
                 { "SCMP_ARCH_S390X",       SCMP_ARCH_S390X       },
                 { "SCMP_ARCH_X32",         SCMP_ARCH_X32         },

src/shared/bus-unit-util.c

@@ -10,7 +10,6 @@
 #include "condition.h"
 #include "coredump-util.h"
 #include "cpu-set-util.h"
-#include "dissect-image.h"
 #include "escape.h"
 #include "exec-util.h"
 #include "exit-status.h"
@@ -1457,8 +1456,6 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
         }
 
         if (streq(field, "RootImageOptions")) {
-                _cleanup_strv_free_ char **l = NULL;
-                char **first = NULL, **second = NULL;
                 const char *p = eq;
 
                 r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
@@ -1469,26 +1466,44 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'v', "a(ss)");
+                r = sd_bus_message_open_container(m, 'v', "a(us)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'a', "(ss)");
+                r = sd_bus_message_open_container(m, 'a', "(us)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = strv_split_colon_pairs(&l, p);
+                for (;;) {
-                if (r < 0)
+                        _cleanup_free_ char *first = NULL, *tuple = NULL;
-                        return log_error_errno(r, "Failed to parse argument: %m");
+                        const char *mount_options = NULL, *second = NULL;
+                        unsigned partition_number = 0;
 
-                STRV_FOREACH_PAIR(first, second, l) {
+                        r = extract_first_word(&p, &tuple, WHITESPACE, EXTRACT_UNQUOTE);
-                        /* Format is either 'root:foo' or 'foo' (root is implied) */
+                        if (r == 0)
-                        if (!isempty(*second) && partition_designator_from_string(*first) < 0)
+                                break;
-                                return bus_log_create_error(-EINVAL);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse argument: %m");
 
-                        r = sd_bus_message_append(m, "(ss)",
+                        second = tuple;
-                                                  !isempty(*second) ? *first : "root",
+                        r = extract_first_word(&second, &first, ":", EXTRACT_UNQUOTE|EXTRACT_DONT_COALESCE_SEPARATORS);
-                                                  !isempty(*second) ? *second : *first);
+                        if (r == 0)
+                                continue;
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse argument: %m");
+
+                        /* Format is either '0:foo' or 'foo' (0 is implied) */
+                        if (!isempty(second) && second[-1] == ':') {
+                                mount_options = second;
+                                r = safe_atou(first, &partition_number);
+                                if (r < 0) {
+                                        log_error_errno(r, "Failed to parse partition number from %s: %m", first);
+                                        continue;
+                                }
+                        } else
+                                mount_options = first;
+
+                        r = sd_bus_message_append(m, "(us)", partition_number, mount_options);
                         if (r < 0)
                                 return bus_log_create_error(r);
                 }
@@ -1509,6 +1524,8 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
         }
 
         if (streq(field, "MountImages")) {
+                _cleanup_strv_free_ char **l = NULL;
+                char **source = NULL, **destination = NULL;
                 const char *p = eq;
 
                 r = sd_bus_message_open_container(m, SD_BUS_TYPE_STRUCT, "sv");
@@ -1519,85 +1536,33 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'v', "a(ssba(ss))");
+                r = sd_bus_message_open_container(m, 'v', "a(ssb)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                r = sd_bus_message_open_container(m, 'a', "(ssba(ss))");
+                r = sd_bus_message_open_container(m, 'a', "(ssb)");
                 if (r < 0)
                         return bus_log_create_error(r);
 
-                for (;;) {
+                r = strv_split_colon_pairs(&l, p);
-                        _cleanup_free_ char *first = NULL, *second = NULL, *tuple = NULL;
+                if (r < 0)
-                        const char *q = NULL, *source = NULL;
+                        return log_error_errno(r, "Failed to parse argument: %m");
+
+                STRV_FOREACH_PAIR(source, destination, l) {
+                        char *s = *source;
                         bool permissive = false;
 
-                        r = extract_first_word(&p, &tuple, NULL, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE);
+                        if (s[0] == '-') {
-                        if (r < 0)
-                                return r;
-                        if (r == 0)
-                                break;
-
-                        q = tuple;
-                        r = extract_many_words(&q, ":", EXTRACT_CUNESCAPE|EXTRACT_UNESCAPE_SEPARATORS, &first, &second, NULL);
-                        if (r < 0)
-                                return r;
-                        if (r == 0)
-                                continue;
-
-                        source = first;
-                        if (source[0] == '-') {
                                 permissive = true;
-                                source++;
+                                s++;
                         }
 
-                        if (isempty(second))
+                        if (isempty(*destination))
                                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                         "Missing argument after ':': %s",
                                                         eq);
 
-                        r = sd_bus_message_open_container(m, 'r', "ssba(ss)");
+                        r = sd_bus_message_append(m, "(ssb)", s, *destination, permissive);
-                        if (r < 0)
-                                return bus_log_create_error(r);
-
-                        r = sd_bus_message_append(m, "ssb", source, second, permissive);
-                        if (r < 0)
-                                return bus_log_create_error(r);
-
-                        r = sd_bus_message_open_container(m, 'a', "(ss)");
-                        if (r < 0)
-                                return bus_log_create_error(r);
-
-                        for (;;) {
-                                _cleanup_free_ char *partition = NULL, *mount_options = NULL;
-
-                                r = extract_many_words(&q, ":", EXTRACT_CUNESCAPE|EXTRACT_UNESCAPE_SEPARATORS, &partition, &mount_options, NULL);
-                                if (r < 0)
-                                        return r;
-                                if (r == 0)
-                                        break;
-                                /* Single set of options, applying to the root partition/single filesystem */
-                                if (r == 1) {
-                                        r = sd_bus_message_append(m, "(ss)", "root", partition);
-                                        if (r < 0)
-                                                return bus_log_create_error(r);
-
-                                        break;
-                                }
-
-                                if (partition_designator_from_string(partition) < 0)
-                                        return bus_log_create_error(-EINVAL);
-
-                                r = sd_bus_message_append(m, "(ss)", partition, mount_options);
-                                if (r < 0)
-                                        return bus_log_create_error(r);
-                        }
-
-                        r = sd_bus_message_close_container(m);
-                        if (r < 0)
-                                return bus_log_create_error(r);
-
-                        r = sd_bus_message_close_container(m);
                         if (r < 0)
                                 return bus_log_create_error(r);
                 }

src/shared/dissect-image.c

@@ -420,7 +420,7 @@ int dissect_image(
                         m->verity = root_hash && verity_data;
                         m->can_verity = !!verity_data;
 
-                        options = mount_options_from_part(mount_options, PARTITION_ROOT);
+                        options = mount_options_from_part(mount_options, 0);
                         if (options) {
                                 o = strdup(options);
                                 if (!o)
@@ -716,7 +716,7 @@ int dissect_image(
                                 if (!n)
                                         return -ENOMEM;
 
-                                options = mount_options_from_part(mount_options, designator);
+                                options = mount_options_from_part(mount_options, nr);
                                 if (options) {
                                         o = strdup(options);
                                         if (!o)
@@ -773,7 +773,7 @@ int dissect_image(
                                 if (!n)
                                         return -ENOMEM;
 
-                                options = mount_options_from_part(mount_options, PARTITION_XBOOTLDR);
+                                options = mount_options_from_part(mount_options, nr);
                                 if (options) {
                                         o = strdup(options);
                                         if (!o)
@@ -827,7 +827,7 @@ int dissect_image(
                         if (multiple_generic)
                                 return -ENOTUNIQ;
 
-                        options = mount_options_from_part(mount_options, PARTITION_ROOT);
+                        options = mount_options_from_part(mount_options, generic_nr);
                         if (options) {
                                 o = strdup(options);
                                 if (!o)
@@ -2023,11 +2023,11 @@ MountOptions* mount_options_free_all(MountOptions *options) {
         return NULL;
 }
 
-const char* mount_options_from_part(const MountOptions *options, int designator) {
+const char* mount_options_from_part(const MountOptions *options, unsigned int partition_number) {
         MountOptions *m;
 
         LIST_FOREACH(mount_options, m, (MountOptions *)options)
-                if (designator == m->partition_designator && !isempty(m->options))
+                if (partition_number == m->partition_number && !isempty(m->options))
                         return m->options;
 
         return NULL;

src/shared/dissect-image.h

@@ -87,14 +87,14 @@ struct DissectedImage {
 };
 
 struct MountOptions {
-        int partition_designator;
+        unsigned partition_number;
         char *options;
         LIST_FIELDS(MountOptions, mount_options);
 };
 
 MountOptions* mount_options_free_all(MountOptions *options);
 DEFINE_TRIVIAL_CLEANUP_FUNC(MountOptions*, mount_options_free_all);
-const char* mount_options_from_part(const MountOptions *options, int designator);
+const char* mount_options_from_part(const MountOptions *options, unsigned int partition_number);
 
 int probe_filesystem(const char *node, char **ret_fstype);
 int dissect_image(int fd, const void *root_hash, size_t root_hash_size, const char *verity_data, const MountOptions *mount_options, DissectImageFlags flags, DissectedImage **ret);

src/shared/seccomp-util.c

@@ -12,7 +12,6 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
-#include "env-util.h"
 #include "errno-list.h"
 #include "macro.h"
 #include "nsflags.h"
@@ -86,8 +85,6 @@ const uint32_t seccomp_local_archs[] = {
                 SCMP_ARCH_PPC64LE,     /* native */
 #elif defined(__powerpc__)
                 SCMP_ARCH_PPC,
-#elif defined(__riscv) && __riscv_xlen == 64 && defined(SCMP_ARCH_RISCV64)
-                SCMP_ARCH_RISCV64,
 #elif defined(__s390x__)
                 SCMP_ARCH_S390,
                 SCMP_ARCH_S390X,      /* native */
@@ -134,10 +131,6 @@ const char* seccomp_arch_to_string(uint32_t c) {
                 return "ppc64";
         case SCMP_ARCH_PPC64LE:
                 return "ppc64-le";
-#ifdef SCMP_ARCH_RISCV64
-        case SCMP_ARCH_RISCV64:
-                return "riscv64";
-#endif
         case SCMP_ARCH_S390:
                 return "s390";
         case SCMP_ARCH_S390X:
@@ -183,10 +176,6 @@ int seccomp_arch_from_string(const char *n, uint32_t *ret) {
                 *ret = SCMP_ARCH_PPC64;
         else if (streq(n, "ppc64-le"))
                 *ret = SCMP_ARCH_PPC64LE;
-#ifdef SCMP_ARCH_RISCV64
-        else if (streq(n, "riscv64"))
-                *ret = SCMP_ARCH_RISCV64;
-#endif
         else if (streq(n, "s390"))
                 *ret = SCMP_ARCH_S390;
         else if (streq(n, "s390x"))
@@ -235,14 +224,6 @@ int seccomp_init_for_arch(scmp_filter_ctx *ret, uint32_t arch, uint32_t default_
         if (r < 0)
                 return r;
 
-#if SCMP_VER_MAJOR >= 3 || (SCMP_VER_MAJOR == 2 && SCMP_VER_MINOR >= 4)
-        if (getenv_bool("SYSTEMD_LOG_SECCOMP") > 0) {
-                r = seccomp_attr_set(seccomp, SCMP_FLTATR_CTL_LOG, 1);
-                if (r < 0)
-                        log_debug_errno(r, "Failed to enable seccomp event logging: %m");
-        }
-#endif
-
         *ret = TAKE_PTR(seccomp);
         return 0;
 }
@@ -1267,13 +1248,7 @@ int seccomp_protect_sysctl(void) {
 
                 log_debug("Operating on architecture: %s", seccomp_arch_to_string(arch));
 
-                if (IN_SET(arch,
+                if (IN_SET(arch, SCMP_ARCH_X32, SCMP_ARCH_AARCH64))
-                           SCMP_ARCH_AARCH64,
-#ifdef SCMP_ARCH_RISCV64
-                           SCMP_ARCH_RISCV64,
-#endif
-                           SCMP_ARCH_X32
-                          ))
                         /* No _sysctl syscall */
                         continue;
 
@@ -1357,9 +1332,6 @@ int seccomp_restrict_address_families(Set *address_families, bool allow_list) {
                 case SCMP_ARCH_MIPS64N32:
                 case SCMP_ARCH_MIPSEL64:
                 case SCMP_ARCH_MIPS64:
-#ifdef SCMP_ARCH_RISCV64
-                case SCMP_ARCH_RISCV64:
-#endif
                         /* These we know we support (i.e. are the ones that do not use socketcall()) */
                         supported = true;
                         break;
@@ -1597,7 +1569,7 @@ static int add_seccomp_syscall_filter(scmp_filter_ctx seccomp,
 }
 
 /* For known architectures, check that syscalls are indeed defined or not. */
-#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64)
+#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
 assert_cc(SCMP_SYS(shmget) > 0);
 assert_cc(SCMP_SYS(shmat) > 0);
 assert_cc(SCMP_SYS(shmdt) > 0);
@@ -1642,16 +1614,13 @@ int seccomp_memory_deny_write_execute(void) {
                 case SCMP_ARCH_X86_64:
                 case SCMP_ARCH_X32:
                 case SCMP_ARCH_AARCH64:
-#ifdef SCMP_ARCH_RISCV64
+                        filter_syscall = SCMP_SYS(mmap); /* amd64, x32 and arm64 have only mmap */
-                case SCMP_ARCH_RISCV64:
-#endif
-                        filter_syscall = SCMP_SYS(mmap); /* amd64, x32, arm64 and riscv64 have only mmap */
                         shmat_syscall = SCMP_SYS(shmat);
                         break;
 
                 /* Please add more definitions here, if you port systemd to other architectures! */
 
-#if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__powerpc64__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__s390__) && !defined(__s390x__) && !(defined(__riscv) && __riscv_xlen == 64)
+#if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) && !defined(__powerpc64__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__s390__) && !defined(__s390x__)
 #warning "Consider adding the right mmap() syscall definitions here!"
 #endif
                 }

src/systemctl/systemctl.c

@@ -5411,56 +5411,24 @@ static int print_property(const char *name, const char *expected_value, sd_bus_m
                         return 1;
                 } else if (streq(name, "MountImages")) {
                         _cleanup_free_ char *paths = NULL;
+                        const char *source, *dest;
+                        int ignore_enoent;
 
-                        r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "(ssba(ss))");
+                        r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "(ssb)");
                         if (r < 0)
                                 return bus_log_parse_error(r);
 
-                        for (;;) {
+                        while ((r = sd_bus_message_read(m, "(ssb)", &source, &dest, &ignore_enoent)) > 0) {
                                 _cleanup_free_ char *str = NULL;
-                                const char *source, *destination, *partition, *mount_options;
-                                int ignore_enoent;
 
-                                r = sd_bus_message_enter_container(m, 'r', "ssba(ss)");
+                                if (isempty(source))
-                                if (r < 0)
+                                        continue;
-                                        return r;
 
-                                r = sd_bus_message_read(m, "ssb", &source, &destination, &ignore_enoent);
+                                if (asprintf(&str, "%s%s:%s", ignore_enoent ? "-" : "", source, dest) < 0)
-                                if (r <= 0)
-                                        break;
-
-                                str = strjoin(ignore_enoent ? "-" : "",
-                                              source,
-                                              ":",
-                                              destination);
-                                if (!str)
                                         return log_oom();
 
-                                r = sd_bus_message_enter_container(m, 'a', "(ss)");
-                                if (r < 0)
-                                        return r;
-
-                                while ((r = sd_bus_message_read(m, "(ss)", &partition, &mount_options)) > 0) {
-                                        _cleanup_free_ char *previous = NULL;
-
-                                        previous = TAKE_PTR(str);
-                                        str = strjoin(strempty(previous), previous ? ":" : "", partition, ":", mount_options);
-                                        if (!str)
-                                                return log_oom();
-                                }
-                                if (r < 0)
-                                        return r;
-
                                 if (!strextend_with_separator(&paths, " ", str, NULL))
                                         return log_oom();
-
-                                r = sd_bus_message_exit_container(m);
-                                if (r < 0)
-                                        return r;
-
-                                r = sd_bus_message_exit_container(m);
-                                if (r < 0)
-                                        return r;
                         }
                         if (r < 0)
                                 return bus_log_parse_error(r);

src/test/test-seccomp.c

@@ -73,9 +73,6 @@ static void test_architecture_table(void) {
                        "ppc\0"
                        "ppc64\0"
                        "ppc64-le\0"
-#ifdef SCMP_ARCH_RISCV64
-                       "riscv64\0"
-#endif
                        "s390\0"
                        "s390x\0") {
                 uint32_t c;

test/units/testsuite-50.sh

@@ -128,69 +128,56 @@ umount ${image_dir}/mount
 
 systemd-run -t --property RootImage=${image}.gpt --property RootHash=${roothash} /usr/bin/cat /usr/lib/os-release | grep -q -F "MARKER=1"
 
-systemd-run -t --property RootImage=${image}.raw --property RootImageOptions="root:nosuid,dev home:ro,dev ro,noatime" --property MountAPIVFS=yes mount | grep -F "squashfs" | grep -q -F "nosuid"
+systemd-run -t --property RootImage=${image}.raw --property RootImageOptions="1:ro,noatime 2:ro,dev nosuid,dev" --property MountAPIVFS=yes mount | grep -F "squashfs" | grep -q -F "nosuid"
-systemd-run -t --property RootImage=${image}.gpt --property RootImageOptions="root:ro,noatime root:ro,dev" --property MountAPIVFS=yes mount | grep -F "squashfs" | grep -q -F "noatime"
+systemd-run -t --property RootImage=${image}.gpt --property RootImageOptions="1:ro,noatime 1:ro,dev" --property MountAPIVFS=yes mount | grep -F "squashfs" | grep -q -F "noatime"
 
-mkdir -p mkdir -p ${image_dir}/result
 cat > /run/systemd/system/testservice-50a.service <<EOF
 [Service]
 Type=oneshot
-ExecStart=bash -c "mount > /run/result/a"
+ExecStart=mount
-BindPaths=${image_dir}/result:/run/result
-TemporaryFileSystem=/run
 MountAPIVFS=yes
 RootImage=${image}.raw
-RootImageOptions=root:ro,noatime home:ro,dev relatime,dev
+RootImageOptions=1:ro,noatime,nosuid 2:ro,dev noatime,dev
 RootImageOptions=nosuid,dev
 EOF
 systemctl start testservice-50a.service
-grep -F "squashfs" ${image_dir}/result/a | grep -q -F "noatime"
+journalctl -b -u testservice-50a.service | grep -F "squashfs" | grep -q -F "noatime"
-grep -F "squashfs" ${image_dir}/result/a | grep -q -F -v "nosuid"
+journalctl -b -u testservice-50a.service | grep -F "squashfs" | grep -q -F -v "nosuid"
 
 cat > /run/systemd/system/testservice-50b.service <<EOF
 [Service]
 Type=oneshot
-ExecStart=bash -c "mount > /run/result/b"
+ExecStart=mount
-BindPaths=${image_dir}/result:/run/result
-TemporaryFileSystem=/run
 MountAPIVFS=yes
 RootImage=${image}.gpt
-RootImageOptions=root:ro,noatime,nosuid home:ro,dev nosuid,dev
+RootImageOptions=1:ro,noatime,nosuid 2:ro,dev nosuid,dev
-RootImageOptions=home:ro,dev nosuid,dev,%%foo
+RootImageOptions=2:ro,dev nosuid,dev,%%foo
 EOF
 systemctl start testservice-50b.service
-grep -F "squashfs" ${image_dir}/result/b | grep -q -F "noatime"
+journalctl -b -u testservice-50b.service | grep -F "squashfs" | grep -q -F "noatime"
 
 # Check that specifier escape is applied %%foo -> %foo
 busctl get-property org.freedesktop.systemd1 /org/freedesktop/systemd1/unit/testservice_2d50b_2eservice org.freedesktop.systemd1.Service RootImageOptions | grep -F "nosuid,dev,%foo"
 
-# Now do some checks with MountImages, both by itself, with options and in combination with RootImage, and as single FS or GPT image
+# Now do some checks with MountImages, both by itself and in combination with RootImage, and as single FS or GPT image
 systemd-run -t --property MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" /usr/bin/cat /run/img1/usr/lib/os-release | grep -q -F "MARKER=1"
 systemd-run -t --property MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" /usr/bin/cat /run/img2/usr/lib/os-release | grep -q -F "MARKER=1"
-systemd-run -t --property MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2:nosuid,dev" --property MountAPIVFS=yes mount | grep -F "squashfs" | grep -q -F "nosuid"
-systemd-run -t --property MountImages="${image}.gpt:/run/img1:root:nosuid ${image}.raw:/run/img2:home:suid" --property MountAPIVFS=yes mount | grep -F "squashfs" | grep -q -F "nosuid"
 systemd-run -t --property MountImages="${image}.raw:/run/img2\:3" /usr/bin/cat /run/img2:3/usr/lib/os-release | grep -q -F "MARKER=1"
-systemd-run -t --property MountImages="${image}.raw:/run/img2\:3:nosuid" --property MountAPIVFS=yes mount | grep -F "squashfs" | grep -q -F "nosuid"
 systemd-run -t --property TemporaryFileSystem=/run --property RootImage=${image}.raw --property MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" /usr/bin/cat /usr/lib/os-release | grep -q -F "MARKER=1"
 systemd-run -t --property TemporaryFileSystem=/run --property RootImage=${image}.raw --property MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" /usr/bin/cat /run/img1/usr/lib/os-release | grep -q -F "MARKER=1"
 systemd-run -t --property TemporaryFileSystem=/run --property RootImage=${image}.gpt --property RootHash=${roothash} --property MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" /usr/bin/cat /run/img2/usr/lib/os-release | grep -q -F "MARKER=1"
-cat >/run/systemd/system/testservice-50c.service <<EOF
+cat >/run/systemd/system/testservice-50.service <<EOF
 [Service]
-MountAPIVFS=yes
 TemporaryFileSystem=/run
 RootImage=${image}.raw
-MountImages=${image}.gpt:/run/img1:root:noatime:home:relatime
+MountImages=${image}.gpt:/run/img1
-MountImages=${image}.raw:/run/img2\:3:nosuid
+MountImages=${image}.raw:/run/img2\:3
-ExecStart=bash -c "cat /run/img1/usr/lib/os-release > /run/result/c"
+ExecStart=/usr/bin/cat /run/img1/usr/lib/os-release
-ExecStart=bash -c "cat /run/img2:3/usr/lib/os-release >> /run/result/c"
+ExecStart=/usr/bin/cat /run/img2:3/usr/lib/os-release
-ExecStart=bash -c "mount >> /run/result/c"
-BindPaths=${image_dir}/result:/run/result
 Type=oneshot
 EOF
-systemctl start testservice-50c.service
+systemctl start testservice-50.service
-grep -q -F "MARKER=1" ${image_dir}/result/c
+journalctl -b -u testservice-50.service | grep -q -F "MARKER=1"
-grep -F "squashfs" ${image_dir}/result/c | grep -q -F "noatime"
-grep -F "squashfs" ${image_dir}/result/c | grep -q -F -v "nosuid"
 
 echo OK > /testok