]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: make sure we unmount /var late during shutdown 27912/head
authorFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 5 Jun 2023 14:54:31 +0000 (16:54 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Mon, 5 Jun 2023 14:54:31 +0000 (16:54 +0200)
To avoid the "mountpoint is busy" error.

test/TEST-24-CRYPTSETUP/test.sh

index 8ed5cf0e1ba5d964f5e14fcebe27a3405ba91806..d0ec63d870874090b5aca41e15396cfa0e49a8c5 100755 (executable)
@@ -13,7 +13,13 @@ TEST_FORCE_NEWIMAGE=1
 
 PART_UUID="deadbeef-dead-dead-beef-000000000000"
 DM_NAME="test24_varcrypt"
-KERNEL_APPEND+=" rd.luks=1 luks.name=$PART_UUID=$DM_NAME luks.key=$PART_UUID=/keyfile:LABEL=varcrypt_keydev"
+KERNEL_OPTIONS=(
+    "rd.luks=1"
+    "luks.name=$PART_UUID=$DM_NAME"
+    "luks.key=$PART_UUID=/keyfile:LABEL=varcrypt_keydev"
+    "luks.options=$PART_UUID=x-initrd.attach"
+)
+KERNEL_APPEND+=" ${KERNEL_OPTIONS[*]}"
 QEMU_OPTIONS+=" -drive format=raw,cache=unsafe,file=${STATEDIR:?}/keydev.img"
 
 check_result_qemu() {