diff options
| -rw-r--r-- | test/TEST-04-FULL-SYSTEMD/fstab | 4 | ||||
| -rwxr-xr-x | test/TEST-04-FULL-SYSTEMD/test-init.sh | 17 | ||||
| -rwxr-xr-x | test/TEST-04-FULL-SYSTEMD/test.sh | 10 | ||||
| -rwxr-xr-x | test/TEST-10-RAID/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-12-RAID-DEG/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-30-ISCSI/test.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-40-NBD/test.sh | 284 | ||||
| -rwxr-xr-x | test/TEST-50-MULTINIC/test.sh | 4 |
8 files changed, 168 insertions, 157 deletions
diff --git a/test/TEST-04-FULL-SYSTEMD/fstab b/test/TEST-04-FULL-SYSTEMD/fstab index 0cc33705..354107b1 100644 --- a/test/TEST-04-FULL-SYSTEMD/fstab +++ b/test/TEST-04-FULL-SYSTEMD/fstab @@ -1,2 +1,2 @@ -/dev/sda2 / btrfs defaults 0 0 -/dev/sdb2 /usr btrfs subvol=usr,ro 0 0 +LABEL=dracut / btrfs subvol=root 0 0 +LABEL=dracutusr /usr btrfs subvol=usr,ro 0 0 diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh index cb7ce127..dcda926a 100755 --- a/test/TEST-04-FULL-SYSTEMD/test-init.sh +++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh @@ -15,16 +15,19 @@ ismounted() { systemctl --failed --no-legend --no-pager > /failed -if ismounted /usr && [ -f /run/systemd/system/initrd-switch-root.service ] && [ ! -s /failed ]; then +if ismounted /usr && [ ! -s /failed ]; then echo "dracut-root-block-success" >/dev/sdc fi -set -x - cat /proc/mounts - tree /run - dmesg - cat /failed -set +x +journalctl --full --no-pager -o short-monotonic + +if [ -s /failed ]; then + echo "**************************FAILED**************************" + cat /failed + echo "**************************FAILED**************************" +fi + +ls -al /run/systemd/system export TERM=linux export PS1='initramfs-test:\w\$ ' diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh index 65e94c43..0b8e9996 100755 --- a/test/TEST-04-FULL-SYSTEMD/test.sh +++ b/test/TEST-04-FULL-SYSTEMD/test.sh @@ -8,7 +8,7 @@ export KVERSION=${KVERSION-$(uname -r)} #DEBUGFAIL="rd.shell rd.break" #DEBUGFAIL="rd.shell" #DEBUGOUT="quiet systemd.log_level=debug systemd.log_target=console loglevel=77 rd.info rd.debug" -DEBUGOUT="loglevel=0 systemd.log_level=debug systemd.log_target=kmsg" +DEBUGOUT="loglevel=0 systemd.log_level=debug" client_run() { local test_name="$1"; shift local client_opts="$*" @@ -83,10 +83,10 @@ test_setup() { dracut_install grep inst_simple ./fstab /etc/fstab rpm -ql systemd | xargs -r $DRACUT_INSTALL ${initdir+-D "$initdir"} -o -a -l + inst /lib/systemd/system/systemd-remount-fs.service + inst /lib/systemd/systemd-remount-fs inst /lib/systemd/system/systemd-journal-flush.service inst /etc/sysconfig/init - # activate kmsg import - echo 'ImportKernel=yes' >> $initdir/etc/systemd/journald.conf # make a journal directory mkdir -p $initdir/var/log/journal @@ -262,8 +262,8 @@ EOF inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules ) sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ - -a "debug watchdog systemd" \ - -o "network" \ + -a "debug systemd" \ + -o "dash network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount" \ -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \ -f $TESTDIR/initramfs.testing $KVERSION || return 1 diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index be28e210..b71cf9db 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -39,7 +39,7 @@ test_setup() { inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script" inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup" dracut_install grep - dracut_install /lib/systemd/systemd-shutdown + dracut_install -o /lib/systemd/systemd-shutdown find_binary plymouth >/dev/null && dracut_install plymouth cp -a /etc/ld.so.conf* $initdir/etc sudo ldconfig -r "$initdir" diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh index 0354705b..7e4b804c 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/test.sh @@ -19,7 +19,7 @@ client_run() { -hdc $TESTDIR/disk2.img.new \ -hdd $TESTDIR/disk3.img.new \ -net none -kernel /boot/vmlinuz-$KVERSION \ - -append "$* root=LABEL=root rw rd.retry=20 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \ + -append "$* root=LABEL=root rw rd.retry=10 rd.info console=ttyS0,115200n81 selinux=0 rd.debug $DEBUGFAIL " \ -initrd $TESTDIR/initramfs.testing if ! grep -m 1 -q dracut-root-block-success $TESTDIR/root.ext2; then echo "CLIENT TEST END: $@ [FAIL]" diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 1b5c6b1a..c1febc9c 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -161,7 +161,7 @@ test_setup() { inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules ) sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ - -o "plymouth dmraid" \ + -o "dash plymouth dmraid" \ -a "debug" \ -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod" \ -f $TESTDIR/initramfs.testing $KVERSION || return 1 diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index c5add491..dcff8f74 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -18,13 +18,13 @@ run_server() { -hda $TESTDIR/server.ext2 \ -hdb $TESTDIR/nbd.ext2 \ -hdc $TESTDIR/encrypted.ext2 \ - -m 256M -nographic \ - -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ - -net socket,listen=127.0.0.1:12340 \ - -serial $SERIAL \ - -kernel /boot/vmlinuz-$KVERSION \ - -append "root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1 + -m 256M -nographic \ + -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ + -net socket,listen=127.0.0.1:12340 \ + -serial $SERIAL \ + -kernel /boot/vmlinuz-$KVERSION \ + -append "root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \ + -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1 sudo chmod 644 $TESTDIR/server.pid || return 1 # Cleanup the terminal if we have one @@ -49,43 +49,45 @@ client_test() { # Clear out the flags for each test if ! dd if=/dev/zero of=$TESTDIR/flag.img bs=1M count=1; then - echo "Unable to make client sda image" 1>&2 - return 1 + echo "Unable to make client sda image" 1>&2 + return 1 fi + $testdir/run-qemu \ -hda $TESTDIR/flag.img \ - -m 256M -nographic \ - -net nic,macaddr=$mac,model=e1000 \ - -net socket,connect=127.0.0.1:12340 \ - -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rd.debug rd.auto rd.info rd.retry=10 ro quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.testing + -m 512M \ + -nographic \ + -net nic,macaddr=$mac,model=e1000 \ + -net socket,connect=127.0.0.1:12340 \ + -kernel /boot/vmlinuz-$KVERSION \ + -append "$cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \ + -initrd $TESTDIR/initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q nbd-OK $TESTDIR/flag.img; then - echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]" - return 1 + echo "CLIENT TEST END: $test_name [FAILED - BAD EXIT]" + return 1 fi # nbdinfo=( fstype fsoptions ) nbdinfo=($(awk '{print $2, $3; exit}' $TESTDIR/flag.img)) if [[ "${nbdinfo[0]}" != "$fstype" ]]; then - echo "CLIENT TEST END: $test_name [FAILED - WRONG FS TYPE]" - return 1 + echo "CLIENT TEST END: $test_name [FAILED - WRONG FS TYPE] \"${nbdinfo[0]}\" != \"$fstype\"" + return 1 fi opts=${nbdinfo[1]}, while [[ $opts ]]; do - if [[ ${opts%%,*} = $fsopt ]]; then - found=1 - break - fi - opts=${opts#*,} + if [[ ${opts%%,*} = $fsopt ]]; then + found=1 + break + fi + opts=${opts#*,} done if [[ ! $found ]]; then - echo "CLIENT TEST END: $test_name [FAILED - BAD FS OPTS]" - return 1 + echo "CLIENT TEST END: $test_name [FAILED - BAD FS OPTS] \"${nbdinfo[1]}\" != \"$fsopt\"" + return 1 fi echo "CLIENT TEST END: $test_name [OK]" @@ -94,89 +96,90 @@ client_test() { test_run() { modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; exit 1; } if ! run_server; then - echo "Failed to start server" 1>&2 - return 1 + echo "Failed to start server" 1>&2 + return 1 fi client_run || { kill_server; return 1; } } client_run() { - # The default is ext3,errors=continue so use that to determine # if our options were parsed and used + client_test "NBD root=nbd:IP:port::fsopts" 52:54:00:12:34:00 \ + "root=nbd:192.168.50.1:2000::errors=panic rd.luks=0" \ + ext3 errors=panic || return 1 + client_test "NBD root=nbd:IP:port" 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000" || return 1 + "root=nbd:192.168.50.1:2000 rd.luks=0" || return 1 client_test "NBD root=nbd:IP:port:fstype" 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000:ext2" ext2 || return 1 - - client_test "NBD root=nbd:IP:port::fsopts" 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000::errors=panic" \ - ext3 errors=panic || return 1 + "root=nbd:192.168.50.1:2000:ext2 rd.luks=0" ext2 || return 1 client_test "NBD root=nbd:IP:port:fstype:fsopts" 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000:ext2:errors=panic" \ - ext2 errors=panic || return 1 + "root=nbd:192.168.50.1:2000:ext2:errors=panic rd.luks=0" \ + ext2 errors=panic || return 1 client_test "NBD Bridge root=nbd:IP:port:fstype:fsopts" 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000:ext2:errors=panic bridge" \ - ext2 errors=panic || return 1 + "root=nbd:192.168.50.1:2000:ext2:errors=panic bridge rd.luks=0" \ + ext2 errors=panic || return 1 # There doesn't seem to be a good way to validate the NBD options, so # just check that we don't screw up the other options client_test "NBD root=nbd:IP:port:::NBD opts" 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000:::bs=2048" || return 1 + "root=nbd:192.168.50.1:2000:::bs=2048 rd.luks=0" || return 1 client_test "NBD root=nbd:IP:port:fstype::NBD opts" 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000:ext2::bs=2048" ext2 || return 1 + "root=nbd:192.168.50.1:2000:ext2::bs=2048 rd.luks=0" ext2 || return 1 client_test "NBD root=nbd:IP:port:fstype:fsopts:NBD opts" \ - 52:54:00:12:34:00 \ - "root=nbd:192.168.50.1:2000:ext2:errors=panic:bs=2048" \ - ext2 errors=panic || return 1 + 52:54:00:12:34:00 \ + "root=nbd:192.168.50.1:2000:ext2:errors=panic:bs=2048 rd.luks=0" \ + ext2 errors=panic || return 1 # DHCP root-path parsing client_test "NBD root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \ - "root=dhcp" || return 1 + "root=dhcp rd.luks=0" || return 1 client_test "NBD Bridge root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \ - "root=dhcp bridge" || return 1 + "root=dhcp bridge rd.luks=0" || return 1 client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype" \ - 52:54:00:12:34:02 "root=dhcp" ext2 || return 1 + 52:54:00:12:34:02 "root=dhcp rd.luks=0" ext2 || return 1 client_test "NBD root=dhcp DHCP root-path nbd:srv:port::fsopts" \ - 52:54:00:12:34:03 "root=dhcp" ext3 errors=panic || return 1 + 52:54:00:12:34:03 "root=dhcp rd.luks=0" ext3 errors=panic || return 1 client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \ - 52:54:00:12:34:04 "root=dhcp" ext2 errors=panic || return 1 + 52:54:00:12:34:04 "root=dhcp rd.luks=0" ext2 errors=panic || return 1 # netroot handling client_test "NBD netroot=nbd:IP:port" 52:54:00:12:34:00 \ - "netroot=nbd:192.168.50.1:2000" || return 1 + "netroot=nbd:192.168.50.1:2000 rd.luks=0" || return 1 client_test "NBD netroot=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \ - 52:54:00:12:34:04 "netroot=dhcp" ext2 errors=panic || return 1 + 52:54:00:12:34:04 "netroot=dhcp rd.luks=0" ext2 errors=panic || return 1 # Encrypted root handling via LVM/LUKS over NBD + . $TESTDIR/luks.uuid + client_test "NBD root=/dev/dracut/root netroot=nbd:IP:port" \ - 52:54:00:12:34:00 \ - "root=/dev/dracut/root netroot=nbd:192.168.50.1:2001" || return 1 + 52:54:00:12:34:00 \ + "root=/dev/dracut/root rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=nbd:192.168.50.1:2001" || return 1 # XXX This should be ext2,errors=panic but that doesn't currently # XXX work when you have a real root= line in addition to netroot= # XXX How we should work here needs clarification client_test "NBD root=/dev/dracut/root netroot=dhcp (w/ fstype and opts)" \ - 52:54:00:12:34:05 \ - "root=/dev/dracut/root netroot=dhcp" || return 1 + 52:54:00:12:34:05 \ + "root=/dev/dracut/root rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=dhcp" || return 1 if [[ -s server.pid ]]; then - sudo kill -TERM $(cat $TESTDIR/server.pid) - rm -f $TESTDIR/server.pid + sudo kill -TERM $(cat $TESTDIR/server.pid) + rm -f $TESTDIR/server.pid fi } @@ -189,39 +192,39 @@ make_encrypted_root() { kernel=$KVERSION # Create what will eventually be our root filesystem onto an overlay ( - export initdir=$TESTDIR/overlay/source + export initdir=$TESTDIR/overlay/source . $basedir/dracut-functions.sh mkdir -p "$initdir" - (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) - dracut_install sh df free ls shutdown poweroff stty cat ps ln ip \ - mount dmesg mkdir cp ping + (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) + dracut_install sh df free ls shutdown poweroff stty cat ps ln ip \ + mount dmesg mkdir cp ping for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do - [ -f ${_terminfodir}/l/linux ] && break - done - dracut_install -o ${_terminfodir}/l/linux - inst ./client-init.sh /sbin/init - find_binary plymouth >/dev/null && dracut_install plymouth - cp -a /etc/ld.so.conf* $initdir/etc - sudo ldconfig -r "$initdir" + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux + inst ./client-init.sh /sbin/init + find_binary plymouth >/dev/null && dracut_install plymouth + cp -a /etc/ld.so.conf* $initdir/etc + sudo ldconfig -r "$initdir" ) # second, install the files needed to make the root filesystem ( - export initdir=$TESTDIR/overlay - . $basedir/dracut-functions.sh - dracut_install mke2fs poweroff cp umount tune2fs - inst_hook initqueue 01 ./create-root.sh + export initdir=$TESTDIR/overlay + . $basedir/dracut-functions.sh + dracut_install mke2fs poweroff cp umount tune2fs + inst_hook initqueue 01 ./create-root.sh inst_hook initqueue/finished 01 ./finished-false.sh - inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules + inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules ) # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. $basedir/dracut.sh -l -i $TESTDIR/overlay / \ - -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ - -d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \ - -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 + -m "dash crypt lvm mdraid udev-rules base rootfs-block kernel-modules" \ + -d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \ + -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf $TESTDIR/overlay # Invoke KVM and/or QEMU to actually create the target filesystem. @@ -229,10 +232,10 @@ make_encrypted_root() { -hda $TESTDIR/flag.img \ -hdb $TESTDIR/encrypted.ext2 \ -m 256M \ - -nographic -net none \ - -kernel "/boot/vmlinuz-$kernel" \ - -append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0" \ - -initrd $TESTDIR/initramfs.makeroot || return 1 + -nographic -net none \ + -kernel "/boot/vmlinuz-$kernel" \ + -append "root=/dev/dracut/root rw quiet console=ttyS0,115200n81 selinux=0" \ + -initrd $TESTDIR/initramfs.makeroot || return 1 grep -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1 grep -a -m 1 ID_FS_UUID $TESTDIR/flag.img > $TESTDIR/luks.uuid } @@ -245,26 +248,26 @@ make_client_root() { kernel=$KVERSION ( - export initdir=$TESTDIR/mnt - . $basedir/dracut-functions.sh + export initdir=$TESTDIR/mnt + . $basedir/dracut-functions.sh mkdir -p "$initdir" - (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) - dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - dmesg mkdir cp ping + (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp ) + dracut_install sh ls shutdown poweroff stty cat ps ln ip \ + dmesg mkdir cp ping for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do - [ -f ${_terminfodir}/l/linux ] && break - done - dracut_install -o ${_terminfodir}/l/linux - inst ./client-init.sh /sbin/init - inst /etc/nsswitch.conf /etc/nsswitch.conf - inst /etc/passwd /etc/passwd - inst /etc/group /etc/group - for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux + inst ./client-init.sh /sbin/init + inst /etc/nsswitch.conf /etc/nsswitch.conf + inst /etc/passwd /etc/passwd + inst /etc/group /etc/group + for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do [ -e "$i" ] || continue - inst $i - done - cp -a /etc/ld.so.conf* $initdir/etc - sudo ldconfig -r "$initdir" + inst $i + done + cp -a /etc/ld.so.conf* $initdir/etc + sudo ldconfig -r "$initdir" ) sudo umount $TESTDIR/mnt @@ -279,36 +282,36 @@ make_server_root() { kernel=$KVERSION ( - export initdir=$TESTDIR/mnt - . $basedir/dracut-functions.sh + export initdir=$TESTDIR/mnt + . $basedir/dracut-functions.sh mkdir -p "$initdir" - ( - cd "$initdir"; - mkdir -p dev sys proc etc var/run var/lib/dhcpd tmp - ) - dracut_install sh ls shutdown poweroff stty cat ps ln ip \ - dmesg mkdir cp ping grep \ - sleep nbd-server chmod + ( + cd "$initdir"; + mkdir -p dev sys proc etc var/run var/lib/dhcpd tmp + ) + dracut_install sh ls shutdown poweroff stty cat ps ln ip \ + dmesg mkdir cp ping grep \ + sleep nbd-server chmod for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do - [ -f ${_terminfodir}/l/linux ] && break - done - dracut_install -o ${_terminfodir}/l/linux - instmods af_packet - type -P dhcpd >/dev/null && dracut_install dhcpd - [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd - inst ./server-init.sh /sbin/init - inst ./hosts /etc/hosts - inst ./dhcpd.conf /etc/dhcpd.conf - inst /etc/nsswitch.conf /etc/nsswitch.conf - inst /etc/passwd /etc/passwd - inst /etc/group /etc/group - for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do + [ -f ${_terminfodir}/l/linux ] && break + done + dracut_install -o ${_terminfodir}/l/linux + instmods af_packet + type -P dhcpd >/dev/null && dracut_install dhcpd + [ -x /usr/sbin/dhcpd3 ] && inst /usr/sbin/dhcpd3 /usr/sbin/dhcpd + inst ./server-init.sh /sbin/init + inst ./hosts /etc/hosts + inst ./dhcpd.conf /etc/dhcpd.conf + inst /etc/nsswitch.conf /etc/nsswitch.conf + inst /etc/passwd /etc/passwd + inst /etc/group /etc/group + for i in /usr/lib*/libnss_files* /lib*/libnss_files*;do [ -e "$i" ] || continue - inst $i - done + inst $i + done - cp -a /etc/ld.so.conf* $initdir/etc - sudo ldconfig -r "$initdir" + cp -a /etc/ld.so.conf* $initdir/etc + sudo ldconfig -r "$initdir" ) sudo umount $TESTDIR/mnt @@ -325,34 +328,39 @@ test_setup() { # Make the test image ( - export initdir=$TESTDIR/overlay - . $basedir/dracut-functions.sh - dracut_install poweroff shutdown - inst_hook emergency 000 ./hard-off.sh - inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules + export initdir=$TESTDIR/overlay + . $basedir/dracut-functions.sh + dracut_install poweroff shutdown + inst_hook emergency 000 ./hard-off.sh + inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules inst ./cryptroot-ask.sh /sbin/cryptroot-ask + +# inst ./debug-shell.service /lib/systemd/system/debug-shell.service +# mkdir -p "${initdir}/lib/systemd/system/sysinit.target.wants" +# ln -fs ../debug-shell.service "${initdir}/lib/systemd/system/sysinit.target.wants/debug-shell.service" + . $TESTDIR/luks.uuid mkdir -p $initdir/etc - echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > $initdir/etc/crypttab + echo "luks-$ID_FS_UUID /dev/nbd0 /etc/key" > $initdir/etc/crypttab echo -n test > $initdir/etc/key ) sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ - -m "dash udev-rules rootfs-block base debug kernel-modules" \ - -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \ - -f $TESTDIR/initramfs.server $KVERSION || return 1 + -m "dash udev-rules rootfs-block base debug kernel-modules" \ + -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \ + -f $TESTDIR/initramfs.server $KVERSION || return 1 sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ - -o "plymouth" \ - -a "debug watchdog" \ - -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esbwdt" \ - -f $TESTDIR/initramfs.testing $KVERSION || return 1 + -o "plymouth" \ + -a "debug watchdog" \ + -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esbwdt" \ + -f $TESTDIR/initramfs.testing $KVERSION || return 1 } kill_server() { if [[ -s $TESTDIR/server.pid ]]; then - sudo kill -TERM $(cat $TESTDIR/server.pid) - rm -f $TESTDIR/server.pid + sudo kill -TERM $(cat $TESTDIR/server.pid) + rm -f $TESTDIR/server.pid fi } diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 7ccd3698..65d76b57 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -24,7 +24,7 @@ run_server() { -serial $SERIAL \ -watchdog i6300esb -watchdog-action poweroff \ -kernel /boot/vmlinuz-$KVERSION \ - -append "rd.debug loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ + -append "loglevel=77 root=/dev/sda rootfstype=ext3 rw console=ttyS0,115200n81 selinux=0" \ -initrd $TESTDIR/initramfs.server \ -pidfile $TESTDIR/server.pid -daemonize || return 1 sudo chmod 644 $TESTDIR/server.pid || return 1 @@ -61,7 +61,7 @@ client_test() { -net nic,netdev=net2,macaddr=52:54:00:12:34:$mac3,model=e1000 \ -watchdog i6300esb -watchdog-action poweroff \ -kernel /boot/vmlinuz-$KVERSION \ - -append "$cmdline $DEBUGFAIL rd.retry=5 rd.debug rd.info ro rd.systemd.log_level=debug console=ttyS0,115200n81 selinux=0 rd.copystate rd.chroot init=/sbin/init" \ + -append "$cmdline $DEBUGFAIL rd.retry=5 rd.info ro rd.systemd.log_level=debug console=ttyS0,115200n81 selinux=0 rd.copystate rd.chroot init=/sbin/init" \ -initrd $TESTDIR/initramfs.testing if [[ $? -ne 0 ]] || ! grep -m 1 -q OK $TESTDIR/client.img; then |