|
 |
811c04a |
From 3f7e5358e520b3d55c709a675d46c8080070276d Mon Sep 17 00:00:00 2001
|
|
|
811c04a |
From: Harald Hoyer <harald@redhat.com>
|
|
|
811c04a |
Date: Mon, 30 Jul 2012 18:35:30 +0200
|
|
|
811c04a |
Subject: [PATCH] crypt/crypt-run-generator.sh: do not add already existing
|
|
|
811c04a |
luks
|
|
|
811c04a |
|
|
|
811c04a |
---
|
|
|
811c04a |
modules.d/90crypt/crypt-run-generator.sh | 9 ++++++++-
|
|
|
811c04a |
test/TEST-10-RAID/create-root.sh | 3 ++-
|
|
|
811c04a |
test/TEST-10-RAID/test.sh | 9 +++++++--
|
|
|
811c04a |
test/TEST-12-RAID-DEG/create-root.sh | 3 ++-
|
|
|
811c04a |
test/TEST-12-RAID-DEG/test.sh | 6 ++++++
|
|
|
811c04a |
test/TEST-13-ENC-RAID-LVM/test.sh | 14 +++++++++++---
|
|
|
811c04a |
test/TEST-30-ISCSI/create-root.sh | 3 ---
|
|
|
811c04a |
test/TEST-40-NBD/create-root.sh | 16 +++++++++-------
|
|
|
811c04a |
test/TEST-40-NBD/test.sh | 8 ++++++--
|
|
|
811c04a |
9 files changed, 51 insertions(+), 20 deletions(-)
|
|
|
811c04a |
|
|
|
811c04a |
diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
|
|
|
811c04a |
index d70443e..cb3aedc 100755
|
|
|
811c04a |
--- a/modules.d/90crypt/crypt-run-generator.sh
|
|
|
811c04a |
+++ b/modules.d/90crypt/crypt-run-generator.sh
|
|
|
811c04a |
@@ -1,8 +1,15 @@
|
|
|
811c04a |
-#!/bin/bash
|
|
|
811c04a |
+#!/bin/sh
|
|
|
811c04a |
+
|
|
|
811c04a |
+. /lib/dracut-lib.sh
|
|
|
811c04a |
|
|
|
811c04a |
dev=$1
|
|
|
811c04a |
luks=$2
|
|
|
811c04a |
|
|
|
811c04a |
+while read l rest; do
|
|
|
811c04a |
+ strstr "${l##luks-}" "${luks##luks-}" && exit 0
|
|
|
811c04a |
+done < /etc/crypttab
|
|
|
811c04a |
+
|
|
|
811c04a |
+
|
|
|
811c04a |
echo "$luks $dev" >> /etc/crypttab
|
|
|
811c04a |
/lib/systemd/system-generators/systemd-cryptsetup-generator
|
|
|
811c04a |
systemctl daemon-reload
|
|
|
811c04a |
diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
|
|
|
811c04a |
index 3dd86cb..cd67819 100755
|
|
|
811c04a |
--- a/test/TEST-10-RAID/create-root.sh
|
|
|
811c04a |
+++ b/test/TEST-10-RAID/create-root.sh
|
|
|
811c04a |
@@ -34,5 +34,6 @@ lvm lvchange -a n /dev/dracut/root
|
|
|
811c04a |
udevadm settle
|
|
|
811c04a |
cryptsetup luksClose /dev/mapper/dracut_crypt_test
|
|
|
811c04a |
udevadm settle
|
|
|
811c04a |
-echo "dracut-root-block-created" >/dev/sda1
|
|
|
811c04a |
+eval $(udevadm info --query=env --name=/dev/md0|while read line; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;)
|
|
|
811c04a |
+{ echo "dracut-root-block-created"; echo "ID_FS_UUID=$ID_FS_UUID"; } >/dev/sda1
|
|
|
811c04a |
poweroff -f
|
|
|
811c04a |
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
|
|
|
811c04a |
index d2b1921..45bb62e 100755
|
|
|
811c04a |
--- a/test/TEST-10-RAID/test.sh
|
|
|
811c04a |
+++ b/test/TEST-10-RAID/test.sh
|
|
|
811c04a |
@@ -4,14 +4,14 @@ TEST_DESCRIPTION="root filesystem on an encrypted LVM PV on a RAID-5"
|
|
|
811c04a |
KVERSION=${KVERSION-$(uname -r)}
|
|
|
811c04a |
|
|
|
811c04a |
# Uncomment this to debug failures
|
|
|
811c04a |
-#DEBUGFAIL="rd.shell"
|
|
|
811c04a |
+DEBUGFAIL="rd.shell rd.udev.log-priority=debug loglevel=70 systemd.log_target=kmsg"
|
|
|
811c04a |
test_run() {
|
|
|
811c04a |
DISKIMAGE=$TESTDIR/TEST-10-RAID-root.img
|
|
|
811c04a |
$testdir/run-qemu \
|
|
|
811c04a |
-hda $DISKIMAGE \
|
|
|
811c04a |
-m 256M -nographic \
|
|
|
811c04a |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
811c04a |
- -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
|
|
|
811c04a |
+ -append "root=/dev/dracut/root rw rd.retry=10 console=ttyS0,115200n81 selinux=0 $DEBUGFAIL" \
|
|
|
811c04a |
-initrd $TESTDIR/initramfs.testing
|
|
|
811c04a |
grep -m 1 -q dracut-root-block-success $DISKIMAGE || return 1
|
|
|
811c04a |
}
|
|
|
811c04a |
@@ -70,6 +70,7 @@ test_setup() {
|
|
|
811c04a |
-append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
|
|
|
811c04a |
-initrd $TESTDIR/initramfs.makeroot || return 1
|
|
|
811c04a |
grep -m 1 -q dracut-root-block-created $DISKIMAGE || return 1
|
|
|
811c04a |
+ eval $(grep -a -m 1 ID_FS_UUID $DISKIMAGE)
|
|
|
811c04a |
|
|
|
811c04a |
(
|
|
|
811c04a |
export initdir=$TESTDIR/overlay
|
|
|
811c04a |
@@ -77,8 +78,12 @@ test_setup() {
|
|
|
811c04a |
dracut_install poweroff shutdown
|
|
|
811c04a |
inst_hook emergency 000 ./hard-off.sh
|
|
|
811c04a |
inst ./cryptroot-ask.sh /sbin/cryptroot-ask
|
|
|
811c04a |
+ mkdir -p $initdir/etc
|
|
|
811c04a |
+ echo "luks-$ID_FS_UUID /dev/md0 /etc/key" > $initdir/etc/crypttab
|
|
|
811c04a |
+ echo -n "test" > $initdir/etc/key
|
|
|
811c04a |
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
|
|
|
811c04a |
)
|
|
|
811c04a |
+
|
|
|
811c04a |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
811c04a |
-o "plymouth network" \
|
|
|
811c04a |
-a "debug" \
|
|
|
811c04a |
diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
|
|
|
811c04a |
index 84f5ad2..d5a8c0b 100755
|
|
|
811c04a |
--- a/test/TEST-12-RAID-DEG/create-root.sh
|
|
|
811c04a |
+++ b/test/TEST-12-RAID-DEG/create-root.sh
|
|
|
811c04a |
@@ -41,4 +41,5 @@ udevadm settle
|
|
|
811c04a |
mdadm -W /dev/md0 || :
|
|
|
811c04a |
mdadm --detail --export /dev/md0 |grep MD_UUID > /tmp/mduuid
|
|
|
811c04a |
. /tmp/mduuid
|
|
|
811c04a |
-{ echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID; } > /dev/sda1
|
|
|
811c04a |
+eval $(udevadm info --query=env --name=/dev/md0|while read line; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;)
|
|
|
811c04a |
+{ echo "dracut-root-block-created"; echo MD_UUID=$MD_UUID; echo "ID_FS_UUID=$ID_FS_UUID";} > /dev/sda1
|
|
|
811c04a |
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
|
|
|
811c04a |
index 96c84f8..558e3b0 100755
|
|
|
811c04a |
--- a/test/TEST-12-RAID-DEG/test.sh
|
|
|
811c04a |
+++ b/test/TEST-12-RAID-DEG/test.sh
|
|
|
811c04a |
@@ -103,8 +103,11 @@ test_setup() {
|
|
|
811c04a |
-kernel "/boot/vmlinuz-$kernel" \
|
|
|
811c04a |
-append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
|
|
|
811c04a |
-initrd $TESTDIR/initramfs.makeroot || return 1
|
|
|
811c04a |
+
|
|
|
811c04a |
grep -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
|
|
|
811c04a |
eval $(grep --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
|
|
|
811c04a |
+ eval $(grep -a -m 1 ID_FS_UUID $TESTDIR/root.ext2)
|
|
|
811c04a |
+
|
|
|
811c04a |
(
|
|
|
811c04a |
export initdir=$TESTDIR/overlay
|
|
|
811c04a |
. $basedir/dracut-functions.sh
|
|
|
811c04a |
@@ -114,7 +117,10 @@ test_setup() {
|
|
|
811c04a |
inst ./cryptroot-ask.sh /sbin/cryptroot-ask
|
|
|
811c04a |
mkdir -p $initdir/etc
|
|
|
811c04a |
echo "ARRAY /dev/md0 level=raid5 num-devices=3 UUID=$MD_UUID" > $initdir/etc/mdadm.conf
|
|
|
811c04a |
+ echo "luks-$ID_FS_UUID /dev/md0 /etc/key" > $initdir/etc/crypttab
|
|
|
811c04a |
+ echo -n test > $initdir/etc/key
|
|
|
811c04a |
)
|
|
|
811c04a |
+
|
|
|
811c04a |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
811c04a |
-o "plymouth network" \
|
|
|
811c04a |
-a "debug" \
|
|
|
811c04a |
diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
811c04a |
index f0f7d34..dff3229 100755
|
|
|
811c04a |
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
811c04a |
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
811c04a |
@@ -17,7 +17,7 @@ test_run() {
|
|
|
811c04a |
-hdb $TESTDIR/check-success.img \
|
|
|
811c04a |
-m 256M -nographic \
|
|
|
811c04a |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
811c04a |
- -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $LUKSARGS $DEBUGFAIL" \
|
|
|
811c04a |
+ -append "root=/dev/dracut/root rw quiet rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $LUKSARGS $DEBUGFAIL" \
|
|
|
811c04a |
-initrd $TESTDIR/initramfs.testing
|
|
|
811c04a |
grep -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
|
|
|
811c04a |
echo "CLIENT TEST END: [OK]"
|
|
|
811c04a |
@@ -30,7 +30,7 @@ test_run() {
|
|
|
811c04a |
-hdb $TESTDIR/check-success.img \
|
|
|
811c04a |
-m 256M -nographic \
|
|
|
811c04a |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
811c04a |
- -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
|
|
|
811c04a |
+ -append "root=/dev/dracut/root rw quiet rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL" \
|
|
|
811c04a |
-initrd $TESTDIR/initramfs.testing
|
|
|
811c04a |
grep -m 1 -q dracut-root-block-success $TESTDIR/check-success.img || return 1
|
|
|
811c04a |
echo "CLIENT TEST END: [OK]"
|
|
|
811c04a |
@@ -43,7 +43,7 @@ test_run() {
|
|
|
811c04a |
-hdb $TESTDIR/check-success.img \
|
|
|
811c04a |
-m 256M -nographic \
|
|
|
811c04a |
-net none -kernel /boot/vmlinuz-$KVERSION \
|
|
|
811c04a |
- -append "root=/dev/dracut/root rw quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL rd.luks.uuid=failme" \
|
|
|
811c04a |
+ -append "root=/dev/dracut/root rw quiet rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL rd.luks.uuid=failme" \
|
|
|
811c04a |
-initrd $TESTDIR/initramfs.testing
|
|
|
811c04a |
grep -m 1 -q dracut-root-block-success $TESTDIR/check-success.img && return 1
|
|
|
811c04a |
echo "CLIENT TEST END: [OK]"
|
|
|
811c04a |
@@ -114,6 +114,14 @@ test_setup() {
|
|
|
811c04a |
inst_hook emergency 000 ./hard-off.sh
|
|
|
811c04a |
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
|
|
|
811c04a |
inst ./cryptroot-ask.sh /sbin/cryptroot-ask
|
|
|
811c04a |
+ mkdir -p $initdir/etc
|
|
|
811c04a |
+ i=2
|
|
|
811c04a |
+ for uuid in $cryptoUUIDS; do
|
|
|
811c04a |
+ eval $uuid
|
|
|
811c04a |
+ printf 'luks-%s /dev/sda%s /etc/key\n' $ID_FS_UUID $i
|
|
|
811c04a |
+ ((i+=1))
|
|
|
811c04a |
+ done > $initdir/etc/crypttab
|
|
|
811c04a |
+ echo -n test > $initdir/etc/key
|
|
|
811c04a |
)
|
|
|
811c04a |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
811c04a |
-o "plymouth network" \
|
|
|
811c04a |
diff --git a/test/TEST-30-ISCSI/create-root.sh b/test/TEST-30-ISCSI/create-root.sh
|
|
|
811c04a |
index 6016320..8116a13 100755
|
|
|
811c04a |
--- a/test/TEST-30-ISCSI/create-root.sh
|
|
|
811c04a |
+++ b/test/TEST-30-ISCSI/create-root.sh
|
|
|
811c04a |
@@ -23,6 +23,3 @@ umount /sysroot && \
|
|
|
811c04a |
lvm lvchange -a n /dev/dracut/root && \
|
|
|
811c04a |
echo "dracut-root-block-created" >/dev/sdb
|
|
|
811c04a |
poweroff -f
|
|
|
811c04a |
-
|
|
|
811c04a |
-#lvm lvchange -a n /dev/dracut/root && \
|
|
|
811c04a |
-#cryptsetup luksClose /dev/mapper/dracut_crypt_test && \
|
|
|
811c04a |
diff --git a/test/TEST-40-NBD/create-root.sh b/test/TEST-40-NBD/create-root.sh
|
|
|
811c04a |
index 4bef5f1..5b902c3 100755
|
|
|
811c04a |
--- a/test/TEST-40-NBD/create-root.sh
|
|
|
811c04a |
+++ b/test/TEST-40-NBD/create-root.sh
|
|
|
811c04a |
@@ -18,11 +18,13 @@ mke2fs -j /dev/dracut/root && \
|
|
|
811c04a |
mkdir -p /sysroot && \
|
|
|
811c04a |
mount /dev/dracut/root /sysroot && \
|
|
|
811c04a |
cp -a -t /sysroot /source/* && \
|
|
|
811c04a |
-umount /sysroot && \
|
|
|
811c04a |
-sleep 1 && \
|
|
|
811c04a |
-lvm lvchange -a n /dev/dracut/root && \
|
|
|
811c04a |
-sleep 1 && \
|
|
|
811c04a |
-cryptsetup luksClose /dev/mapper/dracut_crypt_test && \
|
|
|
811c04a |
-sleep 1 && \
|
|
|
811c04a |
-echo "dracut-root-block-created" >/dev/sda
|
|
|
811c04a |
+umount /sysroot
|
|
|
811c04a |
+sleep 1
|
|
|
811c04a |
+lvm lvchange -a n /dev/dracut/root
|
|
|
811c04a |
+udevadm settle
|
|
|
811c04a |
+cryptsetup luksClose /dev/mapper/dracut_crypt_test
|
|
|
811c04a |
+udevadm settle
|
|
|
811c04a |
+sleep 1
|
|
|
811c04a |
+eval $(udevadm info --query=env --name=/dev/sdb|while read line; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo $line; done;)
|
|
|
811c04a |
+{ echo "dracut-root-block-created"; echo "ID_FS_UUID=$ID_FS_UUID"; } >/dev/sda
|
|
|
811c04a |
poweroff -f
|
|
|
811c04a |
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
|
|
|
811c04a |
index 99d930f..9881630 100755
|
|
|
811c04a |
--- a/test/TEST-40-NBD/test.sh
|
|
|
811c04a |
+++ b/test/TEST-40-NBD/test.sh
|
|
|
811c04a |
@@ -52,7 +52,6 @@ client_test() {
|
|
|
811c04a |
echo "Unable to make client sda image" 1>&2
|
|
|
811c04a |
return 1
|
|
|
811c04a |
fi
|
|
|
811c04a |
-
|
|
|
811c04a |
$testdir/run-qemu \
|
|
|
811c04a |
-hda $TESTDIR/flag.img \
|
|
|
811c04a |
-m 256M -nographic \
|
|
|
811c04a |
@@ -234,6 +233,7 @@ make_encrypted_root() {
|
|
|
811c04a |
-append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0" \
|
|
|
811c04a |
-initrd $TESTDIR/initramfs.makeroot || return 1
|
|
|
811c04a |
grep -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1
|
|
|
811c04a |
+ grep -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid
|
|
|
811c04a |
}
|
|
|
811c04a |
|
|
|
811c04a |
make_client_root() {
|
|
|
811c04a |
@@ -328,7 +328,11 @@ test_setup() {
|
|
|
811c04a |
dracut_install poweroff shutdown
|
|
|
811c04a |
inst_hook emergency 000 ./hard-off.sh
|
|
|
811c04a |
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
|
|
|
811c04a |
- inst ./cryptroot-ask.sh /sbin/cryptroot-ask
|
|
|
811c04a |
+ inst ./cryptroot-ask.sh /sbin/cryptroot-ask
|
|
|
811c04a |
+ . $TESTDIR/luks.uuid
|
|
|
811c04a |
+ mkdir -p $initdir/etc
|
|
|
811c04a |
+ echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > $initdir/etc/crypttab
|
|
|
811c04a |
+ echo -n test > $initdir/etc/key
|
|
|
811c04a |
)
|
|
|
811c04a |
|
|
|
811c04a |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|