TODO

@@ -400,6 +400,8 @@ Features:
 * systemd-repart: allow sizing partitions as factor of available RAM, so that
   we can reasonably size swap partitions for hibernation.
 
+* systemd-repart: allow managing the gpt read-only partition flag + auto-mount flag
+
 * systemd-repart: allow boolean option that ensures that if existing partition
   doesn't exist within the configured size bounds the whole command fails. This
   is useful to implement ESP vs. XBOOTLDR schemes in installers: have one set

man/repart.d.xml

@@ -422,25 +422,12 @@
       <varlistentry>
         <term><varname>CopyBlocks=</varname></term>
 
-        <listitem><para>Takes a path to a regular file, block device node or directory, or the special value
+        <listitem><para>Takes a path to a regular file, block device node or directory. If specified and the
-        <literal>auto</literal>. If specified and the partition is newly created, the data from the specified
+        partition is newly created the data from the specified path is written to the newly created
-        path is written to the newly created partition, on the block level. If a directory is specified, the
+        partition, on the block level. If a directory is specified the backing block device of the file
-        backing block device of the file system the directory is on is determined, and the data read directly
+        system the directory is on is determined and the data read directly from that. This option is useful
-        from that. This option is useful to efficiently replicate existing file systems onto new partitions
+        to efficiently replicate existing file systems on the block level on a new partition, for example to
-        on the block level — for example to build a simple OS installer or an OS image builder.</para>
+        build a simple OS installer or OS image builder.</para>
-
-        <para>If the special value <literal>auto</literal> is specified, the source to copy from is
-        automatically picked up from the running system (or the image specified with
-        <option>--image=</option> — if used). A partition that matches both the configured partition type (as
-        declared with <varname>Type=</varname> above), and the currently mounted directory appropriate for
-        that partition type is determined. For example, if the partition type is set to
-        <literal>root</literal> the partition backing the root directory (<filename>/</filename>) is used as
-        source to copy from — if its partition type is set to <literal>root</literal> as well. If the
-        declared type is <literal>usr</literal> the partition backing <filename>/usr/</filename> is used as
-        source to copy blocks from — if its partition type is set to <literal>usr</literal> too. The logic is
-        capable of automatically tracking down the the backing partitions for encrypted and Verity-enabled
-        volumes. <literal>CopyBlocks=auto</literal> is useful for implementing "self-replicating" systems,
-        i.e. systems that are their own installer.</para>
 
         <para>The file specified here must have a size that is a multiple of the basic block size 512 and not
         be empty. If this option is used, the size allocation algorithm is slightly altered: the partition is
@@ -499,38 +486,7 @@
         <para>The copy operation is executed before the file system is registered in the partition table,
         thus ensuring that a file system populated this way only ever exists fully initialized.</para>
 
-        <para>This option cannot be combined with <varname>CopyBlocks=</varname>.</para>
+        <para>This option cannot be combined with <varname>CopyBlocks=</varname>.</para></listitem>
-
-        <para>When <command>systemd-repart</command> is invoked with the <option>--image=</option> or
-        <option>--root=</option> command line switches the source paths specified are taken relative to the
-        specified root directory or disk image root.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>MakeDirectories=</varname></term>
-
-        <listitem><para>akes one or more absolute paths, separated by whitespace, each declaring a directory
-        to create within the new file system. Behaviour is similar to <varname>CopyFiles=</varname>, but
-        instead of copying in a set of files this just creates the specified directories with the default
-        mode of 0755 owned by the root user and group, plus all their parent directories (with the same
-        ownership and access mode). To configure directories with different ownership or access mode, use
-        <varname>CopyFiles=</varname> and specify a source tree to copy containing appropriately
-        owned/configured directories. This option may be used more than once to create multiple
-        directories. When <varname>CopyFiles=</varname> and <varname>MakeDirectories=</varname> are used
-        together the former is applied first. If a directory listed already exists no operation is executed
-        (in particular, the ownership/access mode of the directories is left as is).</para>
-
-        <para>The primary usecase for this option is to create a minimal set of directories that may be
-        mounted over by other partitions contained in the same disk image. For example, a disk image where
-        the root file system is formatted at first boot might want to automatically pre-create
-        <filename>/usr/</filename> in it this way, so that the <literal>usr</literal> partition may
-        over-mount it.</para>
-
-        <para>Consider using
-        <citerefentry><refentrytitle>systemd-tmpfiles</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        with its <option>--image=</option> option to pre-create other, more complex directory hierarchies (as
-        well as other inodes) with fine-grained control of ownership, access modes and other file
-        attributes.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -565,29 +521,6 @@
         factory reset operation. This functionality is useful to implement schemes where images can be reset
         into their original state by removing partitions and creating them anew. Defaults to off.</para></listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><varname>Flags=</varname></term>
-
-        <listitem><para>Configures the 64bit GPT partition flags to set for the partition when creating
-        it. This option has no effect if the partition already exists. If not specified the flags values is
-        set to all zeroes, except if the partition type (as configured with <varname>Type=</varname> above)
-        refers to a Verity partition, in wich case bit 60 is set (i.e. the read-only bit). This bit may also
-        be configured separately via <varname>ReadOnly=</varname>, see below. Specify the flags value in
-        hexadecimal (by prefixing it with <literal>0x</literal>), binary (prefix <literal>0b</literal>) or
-        decimal (no prefix).</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><varname>ReadOnly=</varname></term>
-
-        <listitem><para>Configures the Read-Only partition flags (bit 60) of the partition table entry. This
-        option is a friendly way to set bit 60 of the partition flags value without setting any of the other
-        bits, and may be set via <varname>Flags=</varname> too, see above.</para>
-
-        <para>If both <varname>Flags=</varname> and <varname>ReadOnly=</varname> are set the latter controls
-        the value of the flag.</para></listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
 

man/systemd-repart.xml

@@ -40,17 +40,16 @@
     <citerefentry><refentrytitle>repart.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     </para>
 
-    <para>If invoked with no arguments, it operates on the block device backing the root file system
+    <para>If invoked with no arguments, it operates on the block device backing the root file system partition
-    partition of the running OS, thus growing and adding partitions of the booted OS image itself. If
+    of the OS, thus growing and adding partitions of the booted OS image itself. When called in the initial
-    <varname>--image=</varname> is used it will operate on the specified image file. When called in the
+    RAM disk it operates on the block device backing <filename>/sysroot/</filename> instead, i.e. on the
-    <literal>initrd</literal> it operates on the block device backing <filename>/sysroot/</filename> instead,
+    block device the system will soon transition into. The <filename>systemd-repart.service</filename>
-    i.e. on the block device the system will soon transition into. The
+    service is generally run at boot in the initial RAM disk, in order to augment the partition table of the
-    <filename>systemd-repart.service</filename> service is generally run at boot in the initial RAM disk, in
+    OS before its partitions are mounted. <command>systemd-repart</command> (mostly) operates in a purely
-    order to augment the partition table of the OS before its partitions are
+    incremental mode: it only grows existing and adds new partitions; it does not shrink, delete or move
-    mounted. <command>systemd-repart</command> (mostly) operates in a purely incremental mode: it only grows
+    existing partitions. The service is intended to be run on every boot, but when it detects that the
-    existing and adds new partitions; it does not shrink, delete or move existing partitions. The service is
+    partition table already matches the installed <filename>repart.d/*.conf</filename> configuration
-    intended to be run on every boot, but when it detects that the partition table already matches the
+    files, it executes no operation.</para>
-    installed <filename>repart.d/*.conf</filename> configuration files, it executes no operation.</para>
 
     <para><command>systemd-repart</command> is intended to be used when deploying OS images, to automatically
     adjust them to the system they are running on, during first boot. This way the deployed image can be
@@ -252,21 +251,13 @@
         <term><option>--root=</option></term>
 
         <listitem><para>Takes a path to a directory to use as root file system when searching for
-        <filename>repart.d/*.conf</filename> files, for the machine ID file to use as seed and for the
+        <filename>repart.d/*.conf</filename> files and for the machine ID file to use as seed. By default
-        <varname>CopyFiles=</varname> and <varname>CopyBlocks=</varname> source files and directories. By
+        when invoked on the regular system this defaults to the host's root file system
-        default when invoked on the regular system this defaults to the host's root file system
         <filename>/</filename>. If invoked from the initial RAM disk this defaults to
         <filename>/sysroot/</filename>, so that the tool operates on the configuration and machine ID stored
         in the root file system later transitioned into itself.</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><option>--image=</option></term>
-
-        <listitem><para>Takes a path to a disk image file or device to mount and use in a similar fashion to
-        <option>--root=</option>, see above.</para></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><option>--seed=</option></term>
 

shell-completion/zsh/_localectl

@@ -39,7 +39,7 @@ _localectl_set-x11-keymap() {
         local -a _file _layout _model _variant _options
         local _xorg_lst
         _xorg_lst=${"$($commands[pkg-config] xkeyboard-config --variable=xkb_base)"}
-        _file=( ${(ps:\n\!:)"$(<$_xorg_lst/rules/base.lst)"} )
+        _file=( ${(ps:\n\!:)"$(<$_xorg_lst/rules/xorg.lst)"} )
         _layout=( ${${${(M)${(f)_file[2]}:#  *}#  }%% *} )
         _model=( ${${${(M)${(f)_file[1]}:#  *}#  }%% *} )
         _variant=( ${${${(M)${(f)_file[3]}:#  *}#  }%% *} )

src/core/namespace.c

@@ -1853,7 +1853,7 @@ int setup_namespace(
 
                 r = loop_device_make_by_path(
                                 root_image,
-                                FLAGS_SET(dissect_image_flags, DISSECT_IMAGE_DEVICE_READ_ONLY) ? O_RDONLY : -1 /* < 0 means writable if possible, read-only as fallback */,
+                                FLAGS_SET(dissect_image_flags, DISSECT_IMAGE_READ_ONLY) ? O_RDONLY : -1 /* < 0 means writable if possible, read-only as fallback */,
                                 FLAGS_SET(dissect_image_flags, DISSECT_IMAGE_NO_PARTITION_TABLE) ? 0 : LO_FLAGS_PARTSCAN,
                                 &loop_device);
                 if (r < 0)

src/dissect/dissect.c

@@ -770,7 +770,7 @@ static int run(int argc, char *argv[]) {
 
         r = loop_device_make_by_path(
                         arg_image,
-                        FLAGS_SET(arg_flags, DISSECT_IMAGE_DEVICE_READ_ONLY) ? O_RDONLY : O_RDWR,
+                        FLAGS_SET(arg_flags, DISSECT_IMAGE_READ_ONLY) ? O_RDONLY : O_RDWR,
                         FLAGS_SET(arg_flags, DISSECT_IMAGE_NO_PARTITION_TABLE) ? 0 : LO_FLAGS_PARTSCAN,
                         &d);
         if (r < 0)

src/shared/cryptsetup-util.h

@@ -61,12 +61,4 @@ int cryptsetup_get_token_as_json(struct crypt_device *cd, int idx, const char *v
 int cryptsetup_get_keyslot_from_token(JsonVariant *v);
 int cryptsetup_add_token_json(struct crypt_device *cd, JsonVariant *v);
 
-#else
-
-/* If libcryptsetup is not available, let's at least define the basic type and NOP destructors for it, to
- * make a little bit less #ifdeferry necessary in main programs. */
-struct crypt_device;
-static inline void sym_crypt_free(struct crypt_device* cd) {}
-static inline void sym_crypt_freep(struct crypt_device** cd) {}
-
 #endif

src/shared/dissect-image.c

@@ -1408,7 +1408,7 @@ static int mount_partition(
         if (streq(fstype, "crypto_LUKS"))
                 return -EUNATCH;
 
-        rw = m->rw && !(flags & DISSECT_IMAGE_MOUNT_READ_ONLY);
+        rw = m->rw && !(flags & DISSECT_IMAGE_READ_ONLY);
 
         if (FLAGS_SET(flags, DISSECT_IMAGE_FSCK) && rw) {
                 r = run_fsck(node, fstype);
@@ -1463,27 +1463,6 @@ static int mount_partition(
                 if (!strextend_with_separator(&options, ",", m->mount_options))
                         return -ENOMEM;
 
-        /* So, when you request MS_RDONLY from ext4, then this means nothing. It happily still writes to the
-         * backing storage. What's worse, the BLKRO[GS]ET flag and (in case of loopback devices)
-         * LO_FLAGS_READ_ONLY don't mean anything, they affect userspace accesses only, and write accesses
-         * from the upper file system still get propagated through to the underlying file system,
-         * unrestricted. To actually get ext4/xfs/btrfs to stop writing to the device we need to specify
-         * "norecovery" as mount option, in addition to MS_RDONLY. Yes, this sucks, since it means we need to
-         * carry a per file system table here.
-         *
-         * Note that this means that we might not be able to mount corrupted file systems as read-only
-         * anymore (since in some cases the kernel implementations will refuse mounting when corrupted,
-         * read-only and "norecovery" is specified). But I think for the case of automatically determined
-         * mount options for loopback devices this is the right choice, since otherwise using the same
-         * loopback file twice even in read-only mode, is going to fail badly sooner or later. The usecase of
-         * making reuse of the immutable images "just work" is more relevant to us than having read-only
-         * access that actually modifies stuff work on such image files. Or to say this differently: if
-         * people want their file systems to be fixed up they should just open them in writable mode, where
-         * all these problems don't exist. */
-        if (!rw && STRPTR_IN_SET(fstype, "ext3", "ext4", "xfs", "btrfs"))
-                if (!strextend_with_separator(&options, ",", "norecovery"))
-                        return -ENOMEM;
-
         r = mount_nofollow_verbose(LOG_DEBUG, node, p, fstype, MS_NODEV|(rw ? 0 : MS_RDONLY), options);
         if (r < 0)
                 return r;
@@ -1777,7 +1756,7 @@ static int decrypt_partition(
                 return log_debug_errno(r, "Failed to load LUKS metadata: %m");
 
         r = sym_crypt_activate_by_passphrase(cd, name, CRYPT_ANY_SLOT, passphrase, strlen(passphrase),
-                                             ((flags & DISSECT_IMAGE_DEVICE_READ_ONLY) ? CRYPT_ACTIVATE_READONLY : 0) |
+                                             ((flags & DISSECT_IMAGE_READ_ONLY) ? CRYPT_ACTIVATE_READONLY : 0) |
                                              ((flags & DISSECT_IMAGE_DISCARD_ON_CRYPTO) ? CRYPT_ACTIVATE_ALLOW_DISCARDS : 0));
         if (r < 0) {
                 log_debug_errno(r, "Failed to activate LUKS device: %m");
@@ -2695,7 +2674,7 @@ int mount_image_privately_interactively(
 
         r = loop_device_make_by_path(
                         image,
-                        FLAGS_SET(flags, DISSECT_IMAGE_DEVICE_READ_ONLY) ? O_RDONLY : O_RDWR,
+                        FLAGS_SET(flags, DISSECT_IMAGE_READ_ONLY) ? O_RDONLY : O_RDWR,
                         FLAGS_SET(flags, DISSECT_IMAGE_NO_PARTITION_TABLE) ? 0 : LO_FLAGS_PARTSCAN,
                         &d);
         if (r < 0)

src/shared/dissect-image.h

@@ -87,13 +87,13 @@ static inline PartitionDesignator PARTITION_VERITY_OF(PartitionDesignator p) {
 }
 
 typedef enum DissectImageFlags {
-        DISSECT_IMAGE_DEVICE_READ_ONLY    = 1 << 0,  /* Make device read-only */
+        DISSECT_IMAGE_READ_ONLY           = 1 << 0,
         DISSECT_IMAGE_DISCARD_ON_LOOP     = 1 << 1,  /* Turn on "discard" if on a loop device and file system supports it */
         DISSECT_IMAGE_DISCARD             = 1 << 2,  /* Turn on "discard" if file system supports it, on all block devices */
         DISSECT_IMAGE_DISCARD_ON_CRYPTO   = 1 << 3,  /* Turn on "discard" also on crypto devices */
-        DISSECT_IMAGE_DISCARD_ANY         = DISSECT_IMAGE_DISCARD_ON_LOOP |
+        DISSECT_IMAGE_DISCARD_ANY = DISSECT_IMAGE_DISCARD_ON_LOOP |
-                                            DISSECT_IMAGE_DISCARD |
+                                    DISSECT_IMAGE_DISCARD |
-                                            DISSECT_IMAGE_DISCARD_ON_CRYPTO,
+                                    DISSECT_IMAGE_DISCARD_ON_CRYPTO,
         DISSECT_IMAGE_GPT_ONLY            = 1 << 4,  /* Only recognize images with GPT partition tables */
         DISSECT_IMAGE_GENERIC_ROOT        = 1 << 5,  /* If no partition table or only single generic partition, assume it's the root fs */
         DISSECT_IMAGE_MOUNT_ROOT_ONLY     = 1 << 6,  /* Mount only the root and /usr partitions */
@@ -107,9 +107,6 @@ typedef enum DissectImageFlags {
         DISSECT_IMAGE_MKDIR               = 1 << 14, /* Make top-level directory to mount right before mounting, if missing */
         DISSECT_IMAGE_USR_NO_ROOT         = 1 << 15, /* If no root fs is in the image, but /usr is, then allow this (so that we can mount the rootfs as tmpfs or so */
         DISSECT_IMAGE_REQUIRE_ROOT        = 1 << 16, /* Don't accept disks without root partition (or at least /usr partition if DISSECT_IMAGE_USR_NO_ROOT is set) */
-        DISSECT_IMAGE_MOUNT_READ_ONLY     = 1 << 17, /* Make mounts read-only */
-        DISSECT_IMAGE_READ_ONLY           = DISSECT_IMAGE_DEVICE_READ_ONLY |
-                                            DISSECT_IMAGE_MOUNT_READ_ONLY,
 } DissectImageFlags;
 
 struct DissectedImage {

src/shared/gpt.c

@@ -106,54 +106,3 @@ int gpt_partition_label_valid(const char *s) {
 
         return char16_strlen(recoded) <= 36;
 }
-
-bool gpt_partition_type_is_root(sd_id128_t id) {
-        return sd_id128_equal(id, GPT_ROOT_X86) ||
-                sd_id128_equal(id, GPT_ROOT_X86_64) ||
-                sd_id128_equal(id, GPT_ROOT_ARM) ||
-                sd_id128_equal(id, GPT_ROOT_ARM_64) ||
-                sd_id128_equal(id, GPT_ROOT_IA64) ||
-                sd_id128_equal(id, GPT_ROOT_RISCV32) ||
-                sd_id128_equal(id, GPT_ROOT_RISCV64);
-}
-
-bool gpt_partition_type_is_root_verity(sd_id128_t id) {
-        return sd_id128_equal(id, GPT_ROOT_X86_VERITY) ||
-                sd_id128_equal(id, GPT_ROOT_X86_64_VERITY) ||
-                sd_id128_equal(id, GPT_ROOT_ARM_VERITY) ||
-                sd_id128_equal(id, GPT_ROOT_ARM_64_VERITY) ||
-                sd_id128_equal(id, GPT_ROOT_IA64_VERITY) ||
-                sd_id128_equal(id, GPT_ROOT_RISCV32_VERITY) ||
-                sd_id128_equal(id, GPT_ROOT_RISCV64_VERITY);
-}
-
-bool gpt_partition_type_is_usr(sd_id128_t id) {
-        return sd_id128_equal(id, GPT_USR_X86) ||
-                sd_id128_equal(id, GPT_USR_X86_64) ||
-                sd_id128_equal(id, GPT_USR_ARM) ||
-                sd_id128_equal(id, GPT_USR_ARM_64) ||
-                sd_id128_equal(id, GPT_USR_IA64) ||
-                sd_id128_equal(id, GPT_USR_RISCV32) ||
-                sd_id128_equal(id, GPT_USR_RISCV64);
-}
-
-bool gpt_partition_type_is_usr_verity(sd_id128_t id) {
-        return sd_id128_equal(id, GPT_USR_X86_VERITY) ||
-                sd_id128_equal(id, GPT_USR_X86_64_VERITY) ||
-                sd_id128_equal(id, GPT_USR_ARM_VERITY) ||
-                sd_id128_equal(id, GPT_USR_ARM_64_VERITY) ||
-                sd_id128_equal(id, GPT_USR_IA64_VERITY) ||
-                sd_id128_equal(id, GPT_USR_RISCV32_VERITY) ||
-                sd_id128_equal(id, GPT_USR_RISCV64_VERITY);
-}
-
-bool gpt_partition_type_knows_read_only(sd_id128_t id) {
-        return gpt_partition_type_is_root(id) ||
-                gpt_partition_type_is_usr(id) ||
-                sd_id128_equal(id, GPT_HOME) ||
-                sd_id128_equal(id, GPT_SRV) ||
-                sd_id128_equal(id, GPT_VAR) ||
-                sd_id128_equal(id, GPT_TMP) ||
-                gpt_partition_type_is_root_verity(id) || /* pretty much implied, but let's set the bit to make things really clear */
-                gpt_partition_type_is_usr_verity(id);    /* ditto */
-}

src/shared/gpt.h

@@ -128,10 +128,3 @@ typedef struct GptPartitionType {
 extern const GptPartitionType gpt_partition_type_table[];
 
 int gpt_partition_label_valid(const char *s);
-
-bool gpt_partition_type_is_root(sd_id128_t id);
-bool gpt_partition_type_is_root_verity(sd_id128_t id);
-bool gpt_partition_type_is_usr(sd_id128_t id);
-bool gpt_partition_type_is_usr_verity(sd_id128_t id);
-
-bool gpt_partition_type_knows_read_only(sd_id128_t id);

src/shared/loop-util.c

@@ -353,7 +353,6 @@ int loop_device_make(
                                 .nr = nr,
                                 .node = TAKE_PTR(loopdev),
                                 .relinquished = true, /* It's not allocated by us, don't destroy it when this object is freed */
-                                .devno = st.st_rdev,
                         };
 
                         *ret = d;
@@ -426,10 +425,6 @@ int loop_device_make(
                                               UINT64_C(240) * USEC_PER_MSEC * n_attempts/64));
         }
 
-        if (fstat(loop_with_fd, &st) < 0)
-                return -errno;
-        assert(S_ISBLK(st.st_mode));
-
         d = new(LoopDevice, 1);
         if (!d)
                 return -ENOMEM;
@@ -437,7 +432,6 @@ int loop_device_make(
                 .fd = TAKE_FD(loop_with_fd),
                 .node = TAKE_PTR(loopdev),
                 .nr = nr,
-                .devno = st.st_rdev,
         };
 
         *ret = d;

src/shared/loop-util.h

@@ -10,7 +10,6 @@ typedef struct LoopDevice LoopDevice;
 struct LoopDevice {
         int fd;
         int nr;
-        dev_t devno;
         char *node;
         bool relinquished;
 };

src/shared/mount-util.h

@@ -93,10 +93,8 @@ int mode_to_inaccessible_node(const char *runtime_dir, mode_t mode, char **dest)
 /* Useful for usage with _cleanup_(), unmounts, removes a directory and frees the pointer */
 static inline char* umount_and_rmdir_and_free(char *p) {
         PROTECT_ERRNO;
-        if (p) {
+        (void) umount_recursive(p, 0);
-                (void) umount_recursive(p, 0);
+        (void) rmdir(p);
-                (void) rmdir(p);
-        }
         return mfree(p);
 }
 DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_rmdir_and_free);

test/TEST-01-BASIC/test.sh

@@ -1,19 +1,17 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Basic systemd setup"
 IMAGE_NAME="basic"
 RUN_IN_UNPRIVILEGED_CONTAINER=${RUN_IN_UNPRIVILEGED_CONTAINER:-yes}
 TEST_REQUIRE_INSTALL_TESTS=0
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 test_append_files() {
     # install tests manually so the test is functional even when -Dinstall-tests=false
-    local dst="${1:?}/usr/lib/systemd/tests/testdata/units/"
+    local dst="$1/usr/lib/systemd/tests/testdata/units/"
     mkdir -p "$dst"
-    cp -v "$TEST_UNITS_DIR"/{testsuite-01,end}.service "$TEST_UNITS_DIR/testsuite.target" "$dst"
+    cp -v $TEST_UNITS_DIR/{testsuite-01,end}.service $TEST_UNITS_DIR/testsuite.target "$dst"
 }
 
 do_test "$@" 01

test/TEST-02-UNITTESTS/test.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Run unit tests under containers"
 RUN_IN_UNPRIVILEGED_CONTAINER=yes
 
@@ -12,63 +11,53 @@ frobnicate!
 $KERNEL_APPEND
 "
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 check_result_nspawn() {
-    local workspace="${1:?}"
+    local _ret=1
-    local ret=1
+    [[ -e $1/testok ]] && _ret=0
-
+    if [[ -s $1/failed ]]; then
-    [[ -e "$workspace/testok" ]] && ret=0
+        _ret=$(($_ret+1))
-
-    if [[ -s "$workspace/failed" ]]; then
-        ret=$((ret + 1))
         echo "=== Failed test log ==="
-        cat "$workspace/failed"
+        cat $1/failed
     else
-        if [[ -s "$workspace/skipped" ]]; then
+        if [[ -s $1/skipped ]]; then
             echo "=== Skipped test log =="
-            cat "$workspace/skipped"
+            cat $1/skipped
         fi
-        if [[ -s "$workspace/testok" ]]; then
+        if [[ -s $1/testok ]]; then
             echo "=== Passed tests ==="
-            cat "$workspace/testok"
+            cat $1/testok
         fi
     fi
-
+    save_journal $1/var/log/journal
-    save_journal "$workspace/var/log/journal"
+    _umount_dir $initdir
-    _umount_dir "${initdir:?}"
+    [[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
-
+    return $_ret
-    [[ -n "${TIMED_OUT:=}" ]] && ret=$((ret + 1))
-    return $ret
 }
 
 check_result_qemu() {
-    local ret=1
+    local _ret=1
-
     mount_initdir
-    [[ -e "${initdir:?}/testok" ]] && ret=0
+    [[ -e $initdir/testok ]] && _ret=0
-
+    if [[ -s $initdir/failed ]]; then
-    if [[ -s "$initdir/failed" ]]; then
+        _ret=$(($_ret+1))
-        ret=$((ret + 1))
         echo "=== Failed test log ==="
-        cat "$initdir/failed"
+        cat $initdir/failed
     else
-        if [[ -s "$initdir/skipped" ]]; then
+        if [[ -s $initdir/skipped ]]; then
             echo "=== Skipped test log =="
-            cat "$initdir/skipped"
+            cat $initdir/skipped
         fi
-        if [[ -s "$initdir/testok" ]]; then
+        if [[ -s $initdir/testok ]]; then
             echo "=== Passed tests ==="
-            cat "$initdir/testok"
+            cat $initdir/testok
         fi
     fi
-
+    save_journal $initdir/var/log/journal
-    save_journal "$initdir/var/log/journal"
+    _umount_dir $initdir
-    _umount_dir "$initdir"
+    [[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
-
+    return $_ret
-    [[ -n "${TIMED_OUT:=}" ]] && ret=$((ret + 1))
-    return $ret
 }
 
 do_test "$@" 02

test/TEST-03-JOBS/test.sh

@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Job-related tests"
 TEST_NO_QEMU=1
 IMAGE_NAME="default"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 03

test/TEST-04-JOURNAL/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Journal-related tests"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 04

test/TEST-05-RLIMITS/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Resource limits-related tests"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 05

test/TEST-06-SELINUX/test.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="SELinux tests"
 IMAGE_NAME="selinux"
 TEST_NO_NSPAWN=1
@@ -13,39 +12,32 @@ TEST_NO_NSPAWN=1
 # Check if selinux-policy-devel is installed, and if it isn't bail out early instead of failing
 test -f /usr/share/selinux/devel/include/system/systemd.if || exit 0
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 SETUP_SELINUX=yes
-KERNEL_APPEND="${KERNEL_APPEND:=} selinux=1 security=selinux"
+KERNEL_APPEND="$KERNEL_APPEND selinux=1 security=selinux"
 
 test_append_files() {
     (
-        local workspace="${1:?}"
-        local policy_headers_dir=/usr/share/selinux/devel
-        local modules_dir=/var/lib/selinux
-
         setup_selinux
-        # Make sure we never expand this to "/..."
+        local _modules_dir=/var/lib/selinux
-        rm -rf "${workspace:?}/$modules_dir"
+        rm -rf $1/$_modules_dir
-
+        if ! cp -ar $_modules_dir $1/$_modules_dir; then
-        if ! cp -ar "$modules_dir" "$workspace/$modules_dir"; then
+            dfatal "Failed to copy $_modules_dir"
-            dfatal "Failed to copy $modules_dir"
             exit 1
         fi
 
-        rm -rf "${workspace:?}/$policy_headers_dir"
+        local _policy_headers_dir=/usr/share/selinux/devel
+        rm -rf $1/$_policy_headers_dir
         inst_dir /usr/share/selinux
-
+        if ! cp -ar $_policy_headers_dir $1/$_policy_headers_dir; then
-        if ! cp -ar "$policy_headers_dir" "$workspace/$policy_headers_dir"; then
+            dfatal "Failed to copy $_policy_headers_dir"
-            dfatal "Failed to copy $policy_headers_dir"
             exit 1
         fi
 
-        mkdir "$workspace/systemd-test-module"
+        mkdir $1/systemd-test-module
-        cp systemd_test.te "$workspace/systemd-test-module"
+        cp systemd_test.te $1/systemd-test-module
-        cp systemd_test.if "$workspace/systemd-test-module"
+        cp systemd_test.if $1/systemd-test-module
-        cp systemd_test.fc "$workspace/systemd-test-module"
+        cp systemd_test.fc $1/systemd-test-module
         dracut_install -o sesearch
         dracut_install runcon
         dracut_install checkmodule semodule semodule_package m4 make load_policy sefcontext_compile

test/TEST-07-ISSUE-1981/test.sh

@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/1981"
 TEST_NO_QEMU=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 NSPAWN_TIMEOUT=30
 

test/TEST-08-ISSUE-2730/test.sh

@@ -1,13 +1,10 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2730"
 IMAGE_NAME="test08"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 QEMU_TIMEOUT=300
 FSTYPE=ext4
 TEST_FORCE_NEWIMAGE=1

test/TEST-09-ISSUE-2691/test.sh

@@ -1,12 +1,9 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2691"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 QEMU_TIMEOUT=300
 
 do_test "$@" 09

test/TEST-10-ISSUE-2467/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2467"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 10

test/TEST-11-ISSUE-3166/test.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3166"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 11

test/TEST-12-ISSUE-3171/test.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3171"
 TEST_NO_QEMU=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 12

test/TEST-13-NSPAWN-SMOKE/test.sh

@@ -1,19 +1,15 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="systemd-nspawn smoke test"
 IMAGE_NAME="nspawn"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 test_append_files() {
     (
-        local workspace="${1:?}"
+        ../create-busybox-container $1/testsuite-13.nc-container
-
+        initdir="$1/testsuite-13.nc-container" dracut_install nc ip md5sum
-        "$TEST_BASE_DIR/create-busybox-container" "$workspace/testsuite-13.nc-container"
-        initdir="$workspace/testsuite-13.nc-container" dracut_install nc ip md5sum
     )
 }
 

test/TEST-14-MACHINE-ID/test.sh

@@ -1,15 +1,13 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="/etc/machine-id testing"
 IMAGE_NAME="badid"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 test_append_files() {
-    printf "556f48e837bc4424a710fa2e2c9d3e3c\ne3d\n" >"${1:?}/etc/machine-id"
+    printf "556f48e837bc4424a710fa2e2c9d3e3c\ne3d\n" >$1/etc/machine-id
 }
 
 do_test "$@" 14

test/TEST-15-DROPIN/test.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Dropin tests"
 TEST_NO_QEMU=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 15

test/TEST-16-EXTEND-TIMEOUT/test.sh

@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="EXTEND_TIMEOUT_USEC=usec start/runtime/stop tests"
 SKIP_INITRD=yes
 TEST_NO_QEMU=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 16

test/TEST-17-UDEV/test.sh

@@ -1,13 +1,10 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="UDEV"
 IMAGE_NAME="udev"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 QEMU_TIMEOUT=500
 
 test_append_files() {

test/TEST-18-FAILUREACTION/test.sh

@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="FailureAction= operation"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 QEMU_TIMEOUT=600
 
 do_test "$@" 18

test/TEST-19-DELEGATE/test.sh

@@ -1,12 +1,9 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test cgroup delegation in the unified hierarchy"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 QEMU_TIMEOUT=600
 UNIFIED_CGROUP_HIERARCHY=yes
 

test/TEST-20-MAINPIDGAMES/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test changing main PID"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 20

test/TEST-22-TMPFILES/test.sh

@@ -1,15 +1,12 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Tmpfiles related tests"
 TEST_NO_QEMU=1
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 test_append_files() {
-    if [[ "${IS_BUILT_WITH_ASAN:=}" == "yes" ]]; then
+    if [[ "$IS_BUILT_WITH_ASAN" == "yes" ]]; then
-        if [[ -z "${initdir:=}" ]]; then
+        if [[ -z "$initdir" ]]; then
             echo >&2 "\$initdir is not defined, can't continue"
             exit 1
         fi

test/TEST-23-TYPE-EXEC/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test Type=exec"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 23

test/TEST-24-CRYPTSETUP/test.sh

@@ -1,77 +1,68 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="cryptsetup systemd setup"
 IMAGE_NAME="cryptsetup"
 TEST_NO_NSPAWN=1
 TEST_FORCE_NEWIMAGE=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 check_result_qemu() {
-    local ret=1
+    ret=1
-
     mount_initdir
-    [[ -e "${initdir:?}/testok" ]] && ret=0
+    [[ -e $initdir/testok ]] && ret=0
-    [[ -f "$initdir/failed" ]] && cp -a "$initdir/failed" "${TESTDIR:?}"
+    [[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
-
+    cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
-    cryptsetup luksOpen "${LOOPDEV:?}p2" varcrypt <"$TESTDIR/keyfile"
+    mount /dev/mapper/varcrypt $initdir/var
-    mount /dev/mapper/varcrypt "$initdir/var"
+    save_journal $initdir/var/log/journal
-    save_journal "$initdir/var/log/journal"
+    _umount_dir $initdir/var
-    _umount_dir "$initdir/var"
+    _umount_dir $initdir
-    _umount_dir "$initdir"
     cryptsetup luksClose /dev/mapper/varcrypt
-
+    [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
-    [[ -f "$TESTDIR/failed" ]] && cat "$TESTDIR/failed"
+    echo $JOURNAL_LIST
-    echo "${JOURNAL_LIST:-No journals were saved}"
+    test -s $TESTDIR/failed && ret=$(($ret+1))
-
-    test -s "$TESTDIR/failed" && ret=$((ret + 1))
     return $ret
 }
 
 test_create_image() {
     create_empty_image_rootdir
-
+    echo -n test >$TESTDIR/keyfile
-    echo -n test >"${TESTDIR:?}/keyfile"
+    cryptsetup -q luksFormat --pbkdf pbkdf2 --pbkdf-force-iterations 1000 ${LOOPDEV}p2 $TESTDIR/keyfile
-    cryptsetup -q luksFormat --pbkdf pbkdf2 --pbkdf-force-iterations 1000 "${LOOPDEV:?}p2" "$TESTDIR/keyfile"
+    cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
-    cryptsetup luksOpen "${LOOPDEV}p2" varcrypt <"$TESTDIR/keyfile"
     mkfs.ext4 -L var /dev/mapper/varcrypt
-    mkdir -p "${initdir:?}/var"
+    mkdir -p $initdir/var
-    mount /dev/mapper/varcrypt "$initdir/var"
+    mount /dev/mapper/varcrypt $initdir/var
 
     # Create what will eventually be our root filesystem onto an overlay
     (
         LOG_LEVEL=5
-        # shellcheck source=/dev/null
+        eval $(udevadm info --export --query=env --name=/dev/mapper/varcrypt)
-        source <(udevadm info --export --query=env --name=/dev/mapper/varcrypt)
+        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-        # shellcheck source=/dev/null
-        source <(udevadm info --export --query=env --name="${LOOPDEV}p2")
 
         setup_basic_environment
         mask_supporting_services
 
         install_dmevent
         generate_module_dependencies
-        cat >"$initdir/etc/crypttab" <<EOF
+        cat >$initdir/etc/crypttab <<EOF
 $DM_NAME UUID=$ID_FS_UUID /etc/varkey
 EOF
-        echo -n test >"$initdir/etc/varkey"
+        echo -n test >$initdir/etc/varkey
-        ddebug <"$initdir/etc/crypttab"
+        cat $initdir/etc/crypttab | ddebug
 
-        cat >>"$initdir/etc/fstab" <<EOF
+        cat >>$initdir/etc/fstab <<EOF
 /dev/mapper/varcrypt    /var    ext4    defaults 0 1
 EOF
 
         # Forward journal messages to the console, so we have something
         # to investigate even if we fail to mount the encrypted /var
-        echo ForwardToConsole=yes >> "$initdir/etc/systemd/journald.conf"
+        echo ForwardToConsole=yes >> $initdir/etc/systemd/journald.conf
     )
 }
 
 cleanup_root_var() {
-    ddebug "umount ${initdir:?}/var"
+    ddebug "umount $initdir/var"
-    mountpoint "$initdir/var" && umount "$initdir/var"
+    mountpoint $initdir/var && umount $initdir/var
     [[ -b /dev/mapper/varcrypt ]] && cryptsetup luksClose /dev/mapper/varcrypt
 }
 

test/TEST-25-IMPORT/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test importd"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 25

test/TEST-26-SETENV/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test setenv"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 26

test/TEST-27-STDOUTFILE/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test StandardOutput=file:"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 27

test/TEST-28-PERCENTJ-WANTEDBY/test.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Ensure %j Wants directives work"
 RUN_IN_UNPRIVILEGED_CONTAINER=yes
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 28

test/TEST-29-PORTABLE/test.sh

@@ -2,14 +2,12 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
-
 TEST_DESCRIPTION="test systemd-portabled"
 IMAGE_NAME="portabled"
 TEST_NO_NSPAWN=1
 TEST_INSTALL_VERITY_MINIMAL=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 # Need loop devices for mounting images
 test_append_files() {

test/TEST-30-ONCLOCKCHANGE/test.sh

@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test OnClockChange= + OnTimezoneChange="
 TEST_NO_NSPAWN=1
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 30

test/TEST-31-DEVICE-ENUMERATION/test.sh

@@ -1,12 +1,9 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="plugged -> dead -> plugged issue #11997"
 TEST_NO_NSPAWN=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 QEMU_TIMEOUT=300
 
 do_test "$@" 31

test/TEST-32-OOMPOLICY/test.sh

@@ -1,11 +1,8 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test OOM killer logic"
 TEST_NO_NSPAWN=1
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 UNIFIED_CGROUP_HIERARCHY=yes
 

test/TEST-33-CLEAN-UNIT/test.sh

@@ -2,10 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
-
 TEST_DESCRIPTION="test CleanUnit"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 33

test/TEST-34-DYNAMICUSERMIGRATE/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test migrating state directory from DynamicUser=1 to DynamicUser=0 and back"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 34

test/TEST-36-NUMAPOLICY/test.sh

@@ -3,10 +3,7 @@ set -e
 
 TEST_DESCRIPTION="test NUMAPolicy= and NUMAMask= options"
 TEST_NO_NSPAWN=1
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
 if qemu_min_version "5.2.0"; then
     QEMU_OPTIONS="-object memory-backend-ram,id=mem0,size=512M -numa node,memdev=mem0,nodeid=0"
 else

test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh

@@ -2,10 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
-
 TEST_DESCRIPTION="test RuntimeDirectoryPreserve=yes"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 37

test/TEST-38-FREEZER/test.sh

@@ -1,10 +1,7 @@
 #!/bin/bash
 set -e
-
 TEST_DESCRIPTION="test unit freezing and thawing via DBus and systemctl"
 TEST_NO_NSPAWN=1
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 38

test/TEST-39-EXECRELOAD/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Test ExecReload= (PR #13098)"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 39

test/TEST-40-EXEC-COMMAND-EX/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test ExecXYZEx= service unit dbus hookups"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 40

test/TEST-41-ONESHOT-RESTART/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Test oneshot unit restart on failure"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 41

test/TEST-42-EXECSTOPPOST/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test that ExecStopPost= is always run"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 42

test/TEST-43-PRIVATEUSER-UNPRIV/test.sh

@@ -1,10 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Test PrivateUsers=yes on user manager"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 has_user_dbus_socket || exit 0
 

test/TEST-44-LOG-NAMESPACE/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test log namespaces"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 44

test/TEST-46-HOMED/test.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="testing homed"
 TEST_NO_QEMU=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 46

test/TEST-47-ISSUE-14566/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Test that KillMode=mixed does not leave left over processes with ExecStopPost="
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 47

test/TEST-48-START-STOP-NO-RELOAD/test.sh

@@ -2,10 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
-
 TEST_DESCRIPTION="test StartStopNoReload"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 48

test/TEST-49-RUNTIME-BIND-PATHS/test.sh

@@ -2,8 +2,6 @@
 set -e
 
 TEST_DESCRIPTION="test adding new BindPaths while unit is already running"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 49

test/TEST-50-DISSECT/test.sh

@@ -2,14 +2,12 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
-
 TEST_DESCRIPTION="test systemd-dissect"
 IMAGE_NAME="dissect"
 TEST_NO_NSPAWN=1
 TEST_INSTALL_VERITY_MINIMAL=1
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 command -v mksquashfs >/dev/null 2>&1 || exit 0
 command -v veritysetup >/dev/null 2>&1 || exit 0

test/TEST-51-ISSUE-16115/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="Test ExecCondition= does not restart on abnormal or failure"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 51

test/TEST-52-HONORFIRSTSHUTDOWN/test.sh

@@ -1,20 +1,18 @@
 #!/bin/bash
 set -e
-
+. $TEST_BASE_DIR/test-functions
 TEST_REQUIRE_INSTALL_TESTS=0
 TEST_DESCRIPTION="testing honor first shutdown"
+#INTERACTIVE_DEBUG=1
 TEST_NO_QEMU=1
 
-# shellcheck source=test/test-functions
+#Using timeout because if the test fails it can loop.
-. "${TEST_BASE_DIR:?}/test-functions"
-
-# Using timeout because if the test fails it can loop.
 # The reason is because the poweroff executed by end.service
 # could turn into a reboot if the test fails.
 NSPAWN_TIMEOUT=20
 
-# Remove this file if it exists. This is used along with
+#Remove this file if it exists. this is used along with
-# the make target "finish". Since concrete confirmation is
+# the make target "finish". Since concrete confirmaion is
 # only found from the console during the poweroff.
 rm -f /tmp/honorfirstshutdown.log >/dev/null
 

test/TEST-53-ISSUE-16347/test.sh

@@ -4,9 +4,8 @@ set -e
 TEST_DESCRIPTION="test timer units when initial clock is ahead"
 TEST_NO_NSPAWN=1
 
-QEMU_OPTIONS="-rtc base=$(date -u +%Y-%m-%dT%H:%M:%S -d '+3 days')"
+future_date=$(date -u +%Y-%m-%dT%H:%M:%S -d '+3 days')
-
+QEMU_OPTIONS="-rtc base=${future_date}"
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 53

test/TEST-54-CREDS/test.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test credentials"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 54

test/TEST-55-OOMD/test.sh

@@ -1,56 +1,47 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="systemd-oomd Memory Pressure Test"
 
-# shellcheck source=test/test-functions
+. $TEST_BASE_DIR/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 check_result_nspawn() {
-    local workspace="${1:?}"
     local ret=1
     local journald_report=""
     local pids=""
-
+    [[ -e $1/testok ]] && ret=0
-    [[ -e "$workspace/testok" ]] && ret=0
+    if [[ -e $1/skipped ]]; then
-    if [[ -e "$workspace/skipped" ]]; then
         echo "TEST-56-OOMD was skipped:"
-        cat "$workspace/skipped"
+        cat $1/skipped
         ret=0
     fi
-
+    [[ -f $1/failed ]] && cp -a $1/failed $TESTDIR
-    [[ -f "$workspace/failed" ]] && cp -a "$workspace/failed" "${TESTDIR:?}"
+    save_journal $1/var/log/journal
-    save_journal "$workspace/var/log/journal"
+    [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
-    [[ -f "$TESTDIR/failed" ]] && cat "$TESTDIR/failed"
+    echo $JOURNAL_LIST
-    echo "${JOURNAL_LIST:-No journals were saved}"
+    test -s $TESTDIR/failed && ret=$(($ret+1))
-
+    [ -n "$TIMED_OUT" ] && ret=$(($ret+1))
-    test -s "$TESTDIR/failed" && ret=$((ret + 1))
+    check_asan_reports "$1" || ret=$(($ret+1))
-    [ -n "${TIMED_OUT:=}" ] && ret=$((ret + 1))
+    _umount_dir $initdir
-    check_asan_reports "$workspace" || ret=$((ret + 1))
-    _umount_dir "${initdir:?}"
     return $ret
 }
 
 check_result_qemu() {
     local ret=1
-
     mount_initdir
-    [[ -e "${initdir:?}/testok" ]] && ret=0
+    [[ -e $initdir/testok ]] && ret=0
-    if [[ -e "$initdir/skipped" ]]; then
+    if [[ -e $initdir/skipped ]]; then
         echo "TEST-56-OOMD was skipped:"
-        cat "$initdir/skipped"
+        cat $initdir/skipped
         ret=0
     fi
-
+    [[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
-    [[ -f "$initdir/failed" ]] && cp -a "$initdir/failed" "${TESTDIR:?}"
+    save_journal $initdir/var/log/journal
-    save_journal "$initdir/var/log/journal"
+    check_asan_reports "$initdir" || ret=$(($ret+1))
-    check_asan_reports "$initdir" || ret=$((ret + 1))
+    _umount_dir $initdir
-    _umount_dir "$initdir"
+    [[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
-    [[ -f "$TESTDIR/failed" ]] && cat "$TESTDIR/failed"
+    echo $JOURNAL_LIST
-    echo "${JOURNAL_LIST:-No journals were saved}"
+    test -s $TESTDIR/failed && ret=$(($ret+1))
-
+    [ -n "$TIMED_OUT" ] && ret=$(($ret+1))
-    test -s "$TESTDIR/failed" && ret=$((ret + 1))
-    [ -n "${TIMED_OUT:=}" ] && ret=$((ret + 1))
     return $ret
 }
 

test/TEST-56-EXIT-TYPE/test.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
-
 TEST_DESCRIPTION="test ExitType=cgroup"
-
+. $TEST_BASE_DIR/test-functions
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
 
 do_test "$@" 56

test/TEST-58-REPART/Makefile

@@ -1 +0,0 @@
-../TEST-01-BASIC/Makefile

test/TEST-58-REPART/test.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e
-TEST_DESCRIPTION="test systemd-repart"
-. $TEST_BASE_DIR/test-functions
-
-do_test "$@" 56

test/units/testsuite-58.service

@@ -1,6 +0,0 @@
-[Unit]
-Description=TEST-56-EXIT-TYPE
-
-[Service]
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot

test/units/testsuite-58.sh

@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-export SYSTEMD_LOG_LEVEL=debug
-export PAGER=cat
-
-mkdir -p /tmp/testsuite-58-defs/
-
-# First part: create a disk image and verify its in order
-
-cat > /tmp/testsuite-58-defs/esp.conf <<EOF
-[Partition]
-Type=esp
-SizeMinBytes=10M
-Format=vfat
-EOF
-
-cat > /tmp/testsuite-58-defs/usr.conf <<EOF
-[Partition]
-Type=usr
-SizeMinBytes=10M
-Format=ext4
-ReadOnly=yes
-EOF
-
-cat > /tmp/testsuite-58-defs/root.conf <<EOF
-[Partition]
-Type=root
-SizeMinBytes=10M
-Format=ext4
-MakeDirectories=/usr /efi
-EOF
-
-systemd-repart --definitions=/tmp/testsuite-58-defs/ --empty=create --size=auto --seed=750b6cd5c4ae4012a15e7be3c29e6a47 /var/tmp/testsuite-58.img
-
-sfdisk --dump /var/tmp/testsuite-58.img > /tmp/testsuite-58.dump
-
-grep -qxF '/var/tmp/testsuite-58.img1 : start=        2048, size=       20480, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B, uuid=39107B09-615D-48FB-BA37-C663885FCE67, name="esp"' /tmp/testsuite-58.dump
-grep -qxF '/var/tmp/testsuite-58.img2 : start=       22528, size=       20480, type=4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709, uuid=60F33797-1D71-4DCB-AA6F-20564F036CD0, name="root-x86-64"' /tmp/testsuite-58.dump
-grep -qxF '/var/tmp/testsuite-58.img3 : start=       43008, size=       20480, type=8484680C-9521-48C6-9C11-B0720656F69E, uuid=7E3369DD-D653-4513-ADF5-B993A9F20C16, name="usr-x86-64", attrs="GUID:60"' /tmp/testsuite-58.dump
-
-# Second part, duplicate it with CopyBlocks=auto
-
-cat > /tmp/testsuite-58-defs/esp.conf <<EOF
-[Partition]
-Type=esp
-CopyBlocks=auto
-EOF
-
-cat > /tmp/testsuite-58-defs/usr.conf <<EOF
-[Partition]
-Type=usr
-ReadOnly=yes
-CopyBlocks=auto
-EOF
-
-cat > /tmp/testsuite-58-defs/root.conf <<EOF
-[Partition]
-Type=root
-CopyBlocks=auto
-EOF
-
-systemd-repart --definitions=/tmp/testsuite-58-defs/ --empty=create --size=auto --seed=750b6cd5c4ae4012a15e7be3c29e6a47 --image=/var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img
-
-cmp /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img
-
-rm -f /var/tmp/testsuite-58.img /var/tmp/testsuite-58.2.img /tmp/testsuite-58.dump
-rm -rf /tmp/testsuite-58-defs/
-
-echo OK >/testok
-
-exit 0