mkosi/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf

@@ -7,7 +7,6 @@ Distribution=|ubuntu
 [Content]
 PrepareScripts=%D/mkosi/mkosi.conf.d/debian-ubuntu/systemd.prepare
 Packages=
-        bsdextrautils
         hostname
         iproute2
         mount

src/import/meson.build

@@ -93,10 +93,6 @@ executables += [
                 'name' : 'systemd-import-generator',
                 'sources' : files('import-generator.c'),
         },
-        test_template + {
-                'sources' : files('test-tar-extract.c'),
-                'type' : 'manual',
-        },
         test_template + {
                 'sources' : files('test-qcow2.c'),
                 'objects' : ['systemd-importd'],
@@ -104,7 +100,6 @@ executables += [
                 'conditions' : ['HAVE_ZLIB'],
                 'type' : 'manual',
         },
-
 ]
 
 install_data('org.freedesktop.import1.conf',

src/import/test-tar-extract.c

@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-#include "fd-util.h"
-#include "libarchive-util.h"
-#include "main-func.h"
-#include "tar-util.h"
-#include "tests.h"
-
-static int run(int argc, char **argv) {
-        int r;
-
-        test_setup_logging(LOG_DEBUG);
-
-        if (argc != 3)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Need two arguments exactly: <input> <output>");
-
-        r = dlopen_libarchive();
-        if (r < 0)
-                return r;
-
-        _cleanup_close_ int input_fd = open(argv[1], O_RDONLY | O_CLOEXEC);
-        if (input_fd < 0)
-                return log_error_errno(input_fd, "Cannot open %s: %m", argv[1]);
-
-        _cleanup_close_ int output_fd = open(argv[2], O_DIRECTORY | O_CLOEXEC);
-        if (output_fd < 0)
-                return log_error_errno(output_fd, "Cannot open %s: %m", argv[2]);
-
-        r = tar_x(input_fd, output_fd, /* flags= */ TAR_SELINUX);
-        if (r < 0)
-                return log_error_errno(r, "tar_x failed: %m");
-
-        return 0;
-}
-
-DEFINE_MAIN_FUNCTION(run);

test/units/TEST-50-DISSECT.dissect.sh

@@ -472,8 +472,8 @@ RootImage=$MINIMAL_IMAGE.raw
 ExtensionImages=/tmp/app0.raw /tmp/app1.raw:nosuid
 # Relevant only for sanitizer runs
 UnsetEnvironment=LD_PRELOAD
-ExecStart=bash -o pipefail -c '/opt/script0.sh | grep ID'
-ExecStart=bash -o pipefail -c '/opt/script1.sh | grep ID'
+ExecStart=bash -c '/opt/script0.sh | grep ID'
+ExecStart=bash -c '/opt/script1.sh | grep ID'
 Type=oneshot
 RemainAfterExit=yes
 EOF
@@ -490,7 +490,7 @@ mkdir "$VDIR" "$EMPTY_VDIR"
 ln -s /tmp/app0.raw "$VDIR/${VBASE}_0.raw"
 ln -s /tmp/app1.raw "$VDIR/${VBASE}_1.raw"
 
-systemd-run -P -p ExtensionImages="$VDIR -$EMPTY_VDIR -$NONEXISTENT_VDIR" bash -o pipefail -c '/opt/script1.sh | grep ID'
+systemd-run -P -p ExtensionImages="$VDIR -$EMPTY_VDIR -$NONEXISTENT_VDIR" bash -c '/opt/script1.sh | grep ID'
 
 rm -rf "$VDIR" "$EMPTY_VDIR"
 
@@ -587,7 +587,7 @@ EnvironmentFile=-/usr/lib/systemd/systemd-asan-env
 PrivateTmp=disconnected
 BindPaths=/tmp/markers/
 ExtensionDirectories=-${VDIR}
-ExecStart=bash -o pipefail -x -c ' \\
+ExecStart=bash -x -c ' \\
     trap "{ \\
         systemd-notify --reloading; \\
         (ls /etc | grep marker || echo no-marker) >/tmp/markers/50g; \\
@@ -628,7 +628,7 @@ EnvironmentFile=-/usr/lib/systemd/systemd-asan-env
 PrivateTmp=disconnected
 BindPaths=/tmp/markers/
 ExtensionImages=-$VDIR2
-ExecStart=bash -o pipefail -x -c ' \\
+ExecStart=bash -x -c ' \\
     trap "{ \\
         systemd-notify --reloading; \\
         (ls /etc | grep marker || echo no-marker) >/tmp/markers/50h; \\
@@ -666,7 +666,7 @@ BindPaths=/tmp/markers/
 RootImage=$MINIMAL_IMAGE.raw
 ExtensionDirectories=-${VDIR}
 NotifyAccess=all
-ExecStart=bash -x -o pipefail -c ' \
+ExecStart=bash -x -c ' \
     trap '"'"' \
         now=\$\$(grep "^now" /proc/timer_list | cut -d" " -f3 | rev | cut -c 4- | rev); \
         stdbuf -o1K printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}\\n" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
@@ -701,7 +701,7 @@ BindPaths=/tmp/markers/
 RootDirectory=/tmp/vpickminimg
 ExtensionDirectories=-${VDIR}
 NotifyAccess=all
-ExecStart=bash -x -o pipefail -c ' \
+ExecStart=bash -x -c ' \
     trap '"'"' \
         now=\$\$(grep "^now" /proc/timer_list | cut -d" " -f3 | rev | cut -c 4- | rev); \
         stdbuf -o1K printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}\\n" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \
@@ -731,7 +731,7 @@ RootImage=$MINIMAL_IMAGE.raw
 ExtensionImages=-$VDIR2 /tmp/app0.raw
 PrivateUsers=yes
 NotifyAccess=all
-ExecStart=bash -x -o pipefail -c ' \
+ExecStart=bash -x -c ' \
     trap '"'"' \
         now=\$\$(grep "^now" /proc/timer_list | cut -d" " -f3 | rev | cut -c 4- | rev); \
         stdbuf -o1K printf "RELOADING=1\\nMONOTONIC_USEC=\$\${now}\\n" | socat -t 5 - UNIX-SENDTO:\$\$NOTIFY_SOCKET; \