test_run() {
$testdir/run-qemu \
- -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
- -m 256M -cpu host -smp 2 -nographic \
- -net none \
- -no-reboot \
- -append "panic=1 root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
- -initrd $TESTDIR/initramfs.testing
+ -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
+ -append "panic=1 systemd.crash_reboot root=/dev/dracut/root rw rd.auto=1 quiet rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
+ -initrd $TESTDIR/initramfs.testing
grep -F -m 1 -q dracut-root-block-success $TESTDIR/root.ext2 || return 1
}
test_setup() {
# Create the blank file to use as a root filesystem
- dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=40
+ dd if=/dev/null of=$TESTDIR/root.ext2 bs=1M seek=80
kernel=$KVERSION
# Create what will eventually be our root filesystem onto an overlay
(
- export initdir=$TESTDIR/overlay/source
- . $basedir/dracut-init.sh
+ export initdir=$TESTDIR/overlay/source
+ . $basedir/dracut-init.sh
(
cd "$initdir"
mkdir -p -- dev sys proc etc var/run tmp
done
mkdir -p -- var/lib/nfs/rpc_pipefs
)
- inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip route \
- mount dmesg ifconfig dhclient mkdir cp ping dhclient
+ inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \
+ mount dmesg dhclient mkdir cp ping dhclient
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
- [ -f ${_terminfodir}/l/linux ] && break
- done
- inst_multiple -o ${_terminfodir}/l/linux
- inst "$basedir/modules.d/40network/dhclient-script.sh" "/sbin/dhclient-script"
- inst "$basedir/modules.d/40network/ifup.sh" "/sbin/ifup"
- inst_multiple grep
+ [ -f ${_terminfodir}/l/linux ] && break
+ done
+ inst_multiple -o ${_terminfodir}/l/linux
+ inst "$basedir/modules.d/35network-legacy/dhclient-script.sh" "/sbin/dhclient-script"
+ inst "$basedir/modules.d/35network-legacy/ifup.sh" "/sbin/ifup"
+ inst_multiple grep
inst_simple /etc/os-release
- inst ./test-init.sh /sbin/init
- find_binary plymouth >/dev/null && inst_multiple plymouth
- cp -a /etc/ld.so.conf* $initdir/etc
- mkdir $initdir/run
- sudo ldconfig -r "$initdir"
+ inst ./test-init.sh /sbin/init
+ find_binary plymouth >/dev/null && inst_multiple plymouth
+ cp -a /etc/ld.so.conf* $initdir/etc
+ mkdir $initdir/run
+ ldconfig -r "$initdir"
)
# second, install the files needed to make the root filesystem
(
- export initdir=$TESTDIR/overlay
- . $basedir/dracut-init.sh
- inst_multiple sfdisk mke2fs poweroff cp umount
- inst_hook initqueue 01 ./create-root.sh
+ export initdir=$TESTDIR/overlay
+ . $basedir/dracut-init.sh
+ inst_multiple sfdisk mke2fs poweroff cp umount
+ 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 lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
- -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
- --no-hostonly-cmdline -N \
- -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
+ -m "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+ --no-hostonly-cmdline -N \
+ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1
rm -rf -- $TESTDIR/overlay
# Invoke KVM and/or QEMU to actually create the target filesystem.
- $testdir/run-qemu -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 -m 256M -cpu host -smp 2 -nographic -net none \
- -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
- -initrd $TESTDIR/initramfs.makeroot || return 1
+ $testdir/run-qemu -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 \
+ -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
+ -initrd $TESTDIR/initramfs.makeroot || return 1
grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
(
- export initdir=$TESTDIR/overlay
- . $basedir/dracut-init.sh
- inst_multiple poweroff shutdown
- inst_hook shutdown-emergency 000 ./hard-off.sh
+ export initdir=$TESTDIR/overlay
+ . $basedir/dracut-init.sh
+ inst_multiple poweroff shutdown
+ inst_hook shutdown-emergency 000 ./hard-off.sh
inst_hook emergency 000 ./hard-off.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
)
- sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
- -o "plymouth network kernel-network-modules" \
- -a "debug" \
- -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
- --no-hostonly-cmdline -N \
- -f $TESTDIR/initramfs.testing $KVERSION || return 1
+ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
+ -o "plymouth network kernel-network-modules" \
+ -a "debug" \
+ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
+ --no-hostonly-cmdline -N \
+ -f $TESTDIR/initramfs.testing $KVERSION || return 1
}
test_cleanup() {