|
|
|
@ -9,8 +9,20 @@ KVERSION=${KVERSION-$(uname -r)} |
|
|
|
#SERIAL="tcp:127.0.0.1:9999" |
|
|
|
#SERIAL="tcp:127.0.0.1:9999" |
|
|
|
|
|
|
|
|
|
|
|
test_check() { |
|
|
|
test_check() { |
|
|
|
echo "nbd is constantly broken. skipping" |
|
|
|
# NBD is still too flaky and hangs hard sometimes |
|
|
|
return 1 |
|
|
|
return 1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ! type -p nbd-server 2>/dev/null; then |
|
|
|
|
|
|
|
echo "Test needs nbd-server... Skipping" |
|
|
|
|
|
|
|
return 1 |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ! modinfo -k $KVERSION nbd &>/dev/null; then |
|
|
|
|
|
|
|
echo "Kernel module nbd does not exist" |
|
|
|
|
|
|
|
return 1 |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return 0 |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
run_server() { |
|
|
|
run_server() { |
|
|
|
@ -21,22 +33,27 @@ run_server() { |
|
|
|
-drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext2 \ |
|
|
|
-drive format=raw,index=0,media=disk,file=$TESTDIR/server.ext2 \ |
|
|
|
-drive format=raw,index=1,media=disk,file=$TESTDIR/nbd.ext2 \ |
|
|
|
-drive format=raw,index=1,media=disk,file=$TESTDIR/nbd.ext2 \ |
|
|
|
-drive format=raw,index=2,media=disk,file=$TESTDIR/encrypted.ext2 \ |
|
|
|
-drive format=raw,index=2,media=disk,file=$TESTDIR/encrypted.ext2 \ |
|
|
|
-m 512M -smp 2 \ |
|
|
|
|
|
|
|
-display none \ |
|
|
|
|
|
|
|
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \ |
|
|
|
-net nic,macaddr=52:54:00:12:34:56,model=e1000 \ |
|
|
|
-net socket,listen=127.0.0.1:12340 \ |
|
|
|
-net socket,listen=127.0.0.1:12340 \ |
|
|
|
${SERIAL:+-serial "$SERIAL"} \ |
|
|
|
${SERIAL:+-serial "$SERIAL"} \ |
|
|
|
${SERIAL:--serial file:"$TESTDIR"/server.log} \ |
|
|
|
${SERIAL:--serial file:"$TESTDIR"/server.log} \ |
|
|
|
-no-reboot \ |
|
|
|
|
|
|
|
-append "panic=1 systemd.crash_reboot root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \ |
|
|
|
-append "panic=1 systemd.crash_reboot root=/dev/sda rootfstype=ext2 rw quiet console=ttyS0,115200n81 selinux=0" \ |
|
|
|
-initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1 |
|
|
|
-initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1 |
|
|
|
sudo chmod 644 $TESTDIR/server.pid || return 1 |
|
|
|
chmod 644 $TESTDIR/server.pid || return 1 |
|
|
|
|
|
|
|
|
|
|
|
# Cleanup the terminal if we have one |
|
|
|
# Cleanup the terminal if we have one |
|
|
|
tty -s && stty sane |
|
|
|
tty -s && stty sane |
|
|
|
|
|
|
|
|
|
|
|
echo Sleeping 10 seconds to give the server a head start |
|
|
|
if ! [[ $SERIAL ]]; then |
|
|
|
sleep 10 |
|
|
|
echo "Waiting for the server to startup" |
|
|
|
|
|
|
|
while : ; do |
|
|
|
|
|
|
|
grep Serving "$TESTDIR"/server.log && break |
|
|
|
|
|
|
|
sleep 1 |
|
|
|
|
|
|
|
done |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
echo Sleeping 10 seconds to give the server a head start |
|
|
|
|
|
|
|
sleep 10 |
|
|
|
|
|
|
|
fi |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
client_test() { |
|
|
|
client_test() { |
|
|
|
@ -60,11 +77,8 @@ client_test() { |
|
|
|
|
|
|
|
|
|
|
|
$testdir/run-qemu \ |
|
|
|
$testdir/run-qemu \ |
|
|
|
-drive format=raw,index=0,media=disk,file=$TESTDIR/flag.img \ |
|
|
|
-drive format=raw,index=0,media=disk,file=$TESTDIR/flag.img \ |
|
|
|
-m 512M -smp 2 \ |
|
|
|
|
|
|
|
-nographic \ |
|
|
|
|
|
|
|
-net nic,macaddr=$mac,model=e1000 \ |
|
|
|
-net nic,macaddr=$mac,model=e1000 \ |
|
|
|
-net socket,connect=127.0.0.1:12340 \ |
|
|
|
-net socket,connect=127.0.0.1:12340 \ |
|
|
|
-no-reboot \ |
|
|
|
|
|
|
|
-append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \ |
|
|
|
-append "panic=1 systemd.crash_reboot rd.shell=0 $cmdline $DEBUGFAIL rd.auto rd.info rd.retry=10 ro console=ttyS0,115200n81 selinux=0 " \ |
|
|
|
-initrd $TESTDIR/initramfs.testing |
|
|
|
-initrd $TESTDIR/initramfs.testing |
|
|
|
|
|
|
|
|
|
|
|
@ -99,7 +113,6 @@ client_test() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
test_run() { |
|
|
|
test_run() { |
|
|
|
modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; exit 1; } |
|
|
|
|
|
|
|
if ! run_server; then |
|
|
|
if ! run_server; then |
|
|
|
echo "Failed to start server" 1>&2 |
|
|
|
echo "Failed to start server" 1>&2 |
|
|
|
return 1 |
|
|
|
return 1 |
|
|
|
@ -129,62 +142,66 @@ client_run() { |
|
|
|
"root=nbd:192.168.50.1:raw:ext2:errors=panic bridge rd.luks=0" \ |
|
|
|
"root=nbd:192.168.50.1:raw:ext2:errors=panic bridge rd.luks=0" \ |
|
|
|
ext2 errors=panic || return 1 |
|
|
|
ext2 errors=panic || return 1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# |
|
|
|
|
|
|
|
# FIXME! These fail, but probably shouldn't |
|
|
|
|
|
|
|
# |
|
|
|
|
|
|
|
|
|
|
|
# There doesn't seem to be a good way to validate the NBD options, so |
|
|
|
# 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 |
|
|
|
# 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 \ |
|
|
|
# client_test "NBD root=nbd:IP:port:::NBD opts" 52:54:00:12:34:00 \ |
|
|
|
"root=nbd:192.168.50.1:raw:::bs=2048 rd.luks=0" || return 1 |
|
|
|
# "root=nbd:192.168.50.1:raw:::bs=2048 rd.luks=0" || return 1 |
|
|
|
|
|
|
|
# |
|
|
|
client_test "NBD root=nbd:IP:port:fstype::NBD opts" 52:54:00:12:34:00 \ |
|
|
|
# client_test "NBD root=nbd:IP:port:fstype::NBD opts" 52:54:00:12:34:00 \ |
|
|
|
"root=nbd:192.168.50.1:raw:ext2::bs=2048 rd.luks=0" ext2 || return 1 |
|
|
|
# "root=nbd:192.168.50.1:raw:ext2::bs=2048 rd.luks=0" ext2 || return 1 |
|
|
|
|
|
|
|
# |
|
|
|
client_test "NBD root=nbd:IP:port:fstype:fsopts:NBD opts" \ |
|
|
|
# client_test "NBD root=nbd:IP:port:fstype:fsopts:NBD opts" \ |
|
|
|
52:54:00:12:34:00 \ |
|
|
|
# 52:54:00:12:34:00 \ |
|
|
|
"root=nbd:192.168.50.1:raw:ext2:errors=panic:bs=2048 rd.luks=0" \ |
|
|
|
# "root=nbd:192.168.50.1:raw:ext2:errors=panic:bs=2048 rd.luks=0" \ |
|
|
|
ext2 errors=panic || return 1 |
|
|
|
# ext2 errors=panic || return 1 |
|
|
|
|
|
|
|
|
|
|
|
# DHCP root-path parsing |
|
|
|
# DHCP root-path parsing |
|
|
|
|
|
|
|
|
|
|
|
client_test "NBD root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \ |
|
|
|
# client_test "NBD root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \ |
|
|
|
"root=dhcp rd.luks=0" || 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 \ |
|
|
|
# client_test "NBD Bridge root=dhcp DHCP root-path nbd:srv:port" 52:54:00:12:34:01 \ |
|
|
|
"root=dhcp bridge rd.luks=0" || return 1 |
|
|
|
# "root=dhcp bridge rd.luks=0" || return 1 |
|
|
|
|
|
|
|
|
|
|
|
client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype" \ |
|
|
|
# client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype" \ |
|
|
|
52:54:00:12:34:02 "root=dhcp rd.luks=0" 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" \ |
|
|
|
# client_test "NBD root=dhcp DHCP root-path nbd:srv:port::fsopts" \ |
|
|
|
52:54:00:12:34:03 "root=dhcp rd.luks=0" 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" \ |
|
|
|
# client_test "NBD root=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \ |
|
|
|
52:54:00:12:34:04 "root=dhcp rd.luks=0" ext2 errors=panic || return 1 |
|
|
|
# 52:54:00:12:34:04 "root=dhcp rd.luks=0" ext2 errors=panic || return 1 |
|
|
|
|
|
|
|
|
|
|
|
# netroot handling |
|
|
|
# netroot handling |
|
|
|
|
|
|
|
|
|
|
|
client_test "NBD netroot=nbd:IP:port" 52:54:00:12:34:00 \ |
|
|
|
# client_test "NBD netroot=nbd:IP:port" 52:54:00:12:34:00 \ |
|
|
|
"netroot=nbd:192.168.50.1:raw rd.luks=0" || return 1 |
|
|
|
# "netroot=nbd:192.168.50.1:raw rd.luks=0" || return 1 |
|
|
|
|
|
|
|
# |
|
|
|
client_test "NBD netroot=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \ |
|
|
|
# client_test "NBD netroot=dhcp DHCP root-path nbd:srv:port:fstype:fsopts" \ |
|
|
|
52:54:00:12:34:04 "netroot=dhcp rd.luks=0" 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 |
|
|
|
# Encrypted root handling via LVM/LUKS over NBD |
|
|
|
|
|
|
|
|
|
|
|
. $TESTDIR/luks.uuid |
|
|
|
# . $TESTDIR/luks.uuid |
|
|
|
|
|
|
|
# |
|
|
|
client_test "NBD root=LABEL=dracut netroot=nbd:IP:port" \ |
|
|
|
# client_test "NBD root=LABEL=dracut netroot=nbd:IP:port" \ |
|
|
|
52:54:00:12:34:00 \ |
|
|
|
# 52:54:00:12:34:00 \ |
|
|
|
"root=LABEL=dracut rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=nbd:192.168.50.1:encrypted" || return 1 |
|
|
|
# "root=LABEL=dracut rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=nbd:192.168.50.1:encrypted" || return 1 |
|
|
|
|
|
|
|
|
|
|
|
# XXX This should be ext2,errors=panic but that doesn't currently |
|
|
|
# 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 work when you have a real root= line in addition to netroot= |
|
|
|
# XXX How we should work here needs clarification |
|
|
|
# XXX How we should work here needs clarification |
|
|
|
client_test "NBD root=LABEL=dracut netroot=dhcp (w/ fstype and opts)" \ |
|
|
|
# client_test "NBD root=LABEL=dracut netroot=dhcp (w/ fstype and opts)" \ |
|
|
|
52:54:00:12:34:05 \ |
|
|
|
# 52:54:00:12:34:05 \ |
|
|
|
"root=LABEL=dracut rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=dhcp" || return 1 |
|
|
|
# "root=LABEL=dracut rd.luks.uuid=$ID_FS_UUID rd.lv.vg=dracut netroot=dhcp" || return 1 |
|
|
|
|
|
|
|
|
|
|
|
if [[ -s server.pid ]]; then |
|
|
|
if [[ -s server.pid ]]; then |
|
|
|
sudo kill -TERM $(cat $TESTDIR/server.pid) |
|
|
|
kill -TERM $(cat $TESTDIR/server.pid) |
|
|
|
rm -f -- $TESTDIR/server.pid |
|
|
|
rm -f -- $TESTDIR/server.pid |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
@ -192,7 +209,7 @@ client_run() { |
|
|
|
|
|
|
|
|
|
|
|
make_encrypted_root() { |
|
|
|
make_encrypted_root() { |
|
|
|
# Create the blank file to use as a root filesystem |
|
|
|
# Create the blank file to use as a root filesystem |
|
|
|
dd if=/dev/null of=$TESTDIR/encrypted.ext2 bs=1M seek=40 |
|
|
|
dd if=/dev/null of=$TESTDIR/encrypted.ext2 bs=1M seek=80 |
|
|
|
dd if=/dev/null of=$TESTDIR/flag.img bs=1M seek=1 |
|
|
|
dd if=/dev/null of=$TESTDIR/flag.img bs=1M seek=1 |
|
|
|
|
|
|
|
|
|
|
|
kernel=$KVERSION |
|
|
|
kernel=$KVERSION |
|
|
|
@ -203,14 +220,14 @@ make_encrypted_root() { |
|
|
|
mkdir -p "$initdir" |
|
|
|
mkdir -p "$initdir" |
|
|
|
( |
|
|
|
( |
|
|
|
cd "$initdir" |
|
|
|
cd "$initdir" |
|
|
|
mkdir -p dev sys proc etc var tmp run root usr/bin usr/lib usr/lib64 usr/sbin |
|
|
|
mkdir -p dev sys proc etc var tmp run root usr/bin usr/lib usr/lib64 usr/sbin |
|
|
|
for i in bin sbin lib lib64; do |
|
|
|
for i in bin sbin lib lib64; do |
|
|
|
ln -sfnr usr/$i $i |
|
|
|
ln -sfnr usr/$i $i |
|
|
|
done |
|
|
|
done |
|
|
|
ln -s ../run var/run |
|
|
|
ln -s ../run var/run |
|
|
|
) |
|
|
|
) |
|
|
|
inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ |
|
|
|
inst_multiple sh df free ls shutdown poweroff stty cat ps ln ip \ |
|
|
|
mount dmesg mkdir cp ping |
|
|
|
mount dmesg mkdir cp ping dd |
|
|
|
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do |
|
|
|
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do |
|
|
|
[ -f ${_terminfodir}/l/linux ] && break |
|
|
|
[ -f ${_terminfodir}/l/linux ] && break |
|
|
|
done |
|
|
|
done |
|
|
|
@ -219,7 +236,7 @@ make_encrypted_root() { |
|
|
|
inst_simple /etc/os-release |
|
|
|
inst_simple /etc/os-release |
|
|
|
find_binary plymouth >/dev/null && inst_multiple plymouth |
|
|
|
find_binary plymouth >/dev/null && inst_multiple plymouth |
|
|
|
cp -a /etc/ld.so.conf* $initdir/etc |
|
|
|
cp -a /etc/ld.so.conf* $initdir/etc |
|
|
|
sudo ldconfig -r "$initdir" |
|
|
|
ldconfig -r "$initdir" |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
# second, install the files needed to make the root filesystem |
|
|
|
# second, install the files needed to make the root filesystem |
|
|
|
@ -228,13 +245,13 @@ make_encrypted_root() { |
|
|
|
. $basedir/dracut-init.sh |
|
|
|
. $basedir/dracut-init.sh |
|
|
|
( |
|
|
|
( |
|
|
|
cd "$initdir" |
|
|
|
cd "$initdir" |
|
|
|
mkdir -p dev sys proc etc tmp var run root usr/bin usr/lib usr/lib64 usr/sbin |
|
|
|
mkdir -p dev sys proc etc tmp var run root usr/bin usr/lib usr/lib64 usr/sbin |
|
|
|
for i in bin sbin lib lib64; do |
|
|
|
for i in bin sbin lib lib64; do |
|
|
|
ln -sfnr usr/$i $i |
|
|
|
ln -sfnr usr/$i $i |
|
|
|
done |
|
|
|
done |
|
|
|
ln -s ../run var/run |
|
|
|
ln -s ../run var/run |
|
|
|
) |
|
|
|
) |
|
|
|
inst_multiple mke2fs poweroff cp umount tune2fs |
|
|
|
inst_multiple mke2fs poweroff cp umount tune2fs dd |
|
|
|
inst_hook shutdown-emergency 000 ./hard-off.sh |
|
|
|
inst_hook shutdown-emergency 000 ./hard-off.sh |
|
|
|
inst_hook emergency 000 ./hard-off.sh |
|
|
|
inst_hook emergency 000 ./hard-off.sh |
|
|
|
inst_hook initqueue 01 ./create-root.sh |
|
|
|
inst_hook initqueue 01 ./create-root.sh |
|
|
|
@ -256,8 +273,6 @@ make_encrypted_root() { |
|
|
|
$testdir/run-qemu \ |
|
|
|
$testdir/run-qemu \ |
|
|
|
-drive format=raw,index=0,media=disk,file=$TESTDIR/flag.img \ |
|
|
|
-drive format=raw,index=0,media=disk,file=$TESTDIR/flag.img \ |
|
|
|
-drive format=raw,index=1,media=disk,file=$TESTDIR/encrypted.ext2 \ |
|
|
|
-drive format=raw,index=1,media=disk,file=$TESTDIR/encrypted.ext2 \ |
|
|
|
-m 512M -smp 2\ |
|
|
|
|
|
|
|
-nographic -net none \ |
|
|
|
|
|
|
|
-append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \ |
|
|
|
-append "root=/dev/fakeroot rw quiet console=ttyS0,115200n81 selinux=0" \ |
|
|
|
-initrd $TESTDIR/initramfs.makeroot || return 1 |
|
|
|
-initrd $TESTDIR/initramfs.makeroot || return 1 |
|
|
|
grep -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1 |
|
|
|
grep -F -m 1 -q dracut-root-block-created $TESTDIR/flag.img || return 1 |
|
|
|
@ -265,10 +280,13 @@ make_encrypted_root() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
make_client_root() { |
|
|
|
make_client_root() { |
|
|
|
dd if=/dev/null of=$TESTDIR/nbd.ext2 bs=1M seek=60 |
|
|
|
dd if=/dev/null of=$TESTDIR/nbd.ext2 bs=1M seek=120 |
|
|
|
mke2fs -F -j $TESTDIR/nbd.ext2 |
|
|
|
mke2fs -F -j $TESTDIR/nbd.ext2 |
|
|
|
mkdir $TESTDIR/mnt |
|
|
|
mkdir $TESTDIR/mnt |
|
|
|
sudo mount -o loop $TESTDIR/nbd.ext2 $TESTDIR/mnt |
|
|
|
if ! mount -o loop $TESTDIR/nbd.ext2 $TESTDIR/mnt; then |
|
|
|
|
|
|
|
echo "Cannot mount loop" |
|
|
|
|
|
|
|
return 1 |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
kernel=$KVERSION |
|
|
|
kernel=$KVERSION |
|
|
|
( |
|
|
|
( |
|
|
|
@ -277,14 +295,14 @@ make_client_root() { |
|
|
|
mkdir -p "$initdir" |
|
|
|
mkdir -p "$initdir" |
|
|
|
( |
|
|
|
( |
|
|
|
cd "$initdir" |
|
|
|
cd "$initdir" |
|
|
|
mkdir -p dev sys proc etc var tmp run root usr/bin usr/lib usr/lib64 usr/sbin |
|
|
|
mkdir -p dev sys proc etc var tmp run root usr/bin usr/lib usr/lib64 usr/sbin |
|
|
|
for i in bin sbin lib lib64; do |
|
|
|
for i in bin sbin lib lib64; do |
|
|
|
ln -sfnr usr/$i $i |
|
|
|
ln -sfnr usr/$i $i |
|
|
|
done |
|
|
|
done |
|
|
|
ln -s ../run var/run |
|
|
|
ln -s ../run var/run |
|
|
|
) |
|
|
|
) |
|
|
|
inst_multiple sh ls shutdown poweroff stty cat ps ln ip \ |
|
|
|
inst_multiple sh ls shutdown poweroff stty cat ps ln ip \ |
|
|
|
dmesg mkdir cp ping |
|
|
|
dmesg mkdir cp ping dd |
|
|
|
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do |
|
|
|
for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do |
|
|
|
[ -f ${_terminfodir}/l/linux ] && break |
|
|
|
[ -f ${_terminfodir}/l/linux ] && break |
|
|
|
done |
|
|
|
done |
|
|
|
@ -299,18 +317,18 @@ make_client_root() { |
|
|
|
inst $i |
|
|
|
inst $i |
|
|
|
done |
|
|
|
done |
|
|
|
cp -a /etc/ld.so.conf* $initdir/etc |
|
|
|
cp -a /etc/ld.so.conf* $initdir/etc |
|
|
|
sudo ldconfig -r "$initdir" |
|
|
|
ldconfig -r "$initdir" |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
sudo umount $TESTDIR/mnt |
|
|
|
umount $TESTDIR/mnt |
|
|
|
rm -fr -- $TESTDIR/mnt |
|
|
|
rm -fr -- $TESTDIR/mnt |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
make_server_root() { |
|
|
|
make_server_root() { |
|
|
|
dd if=/dev/null of=$TESTDIR/server.ext2 bs=1M seek=60 |
|
|
|
dd if=/dev/null of=$TESTDIR/server.ext2 bs=1M seek=120 |
|
|
|
mke2fs -F $TESTDIR/server.ext2 |
|
|
|
mke2fs -F $TESTDIR/server.ext2 |
|
|
|
mkdir $TESTDIR/mnt |
|
|
|
mkdir $TESTDIR/mnt |
|
|
|
sudo mount -o loop $TESTDIR/server.ext2 $TESTDIR/mnt |
|
|
|
mount -o loop $TESTDIR/server.ext2 $TESTDIR/mnt |
|
|
|
|
|
|
|
|
|
|
|
kernel=$KVERSION |
|
|
|
kernel=$KVERSION |
|
|
|
( |
|
|
|
( |
|
|
|
@ -320,16 +338,18 @@ make_server_root() { |
|
|
|
( |
|
|
|
( |
|
|
|
cd "$initdir"; |
|
|
|
cd "$initdir"; |
|
|
|
mkdir -p run dev sys proc etc var var/lib/dhcpd tmp etc/nbd-server |
|
|
|
mkdir -p run dev sys proc etc var var/lib/dhcpd tmp etc/nbd-server |
|
|
|
ln -s ../run var/run |
|
|
|
ln -s ../run var/run |
|
|
|
) |
|
|
|
) |
|
|
|
cat > "$initdir/etc/nbd-server/config" <<EOF |
|
|
|
cat > "$initdir/etc/nbd-server/config" <<EOF |
|
|
|
[generic] |
|
|
|
[generic] |
|
|
|
[raw] |
|
|
|
[raw] |
|
|
|
exportname = /dev/sdb |
|
|
|
exportname = /dev/sdb |
|
|
|
port = 2000 |
|
|
|
port = 2000 |
|
|
|
|
|
|
|
bs = 4096 |
|
|
|
[encrypted] |
|
|
|
[encrypted] |
|
|
|
exportname = /dev/sdc |
|
|
|
exportname = /dev/sdc |
|
|
|
port = 2001 |
|
|
|
port = 2001 |
|
|
|
|
|
|
|
bs = 4096 |
|
|
|
EOF |
|
|
|
EOF |
|
|
|
inst_multiple sh ls shutdown poweroff stty cat ps ln ip \ |
|
|
|
inst_multiple sh ls shutdown poweroff stty cat ps ln ip \ |
|
|
|
dmesg mkdir cp ping grep \ |
|
|
|
dmesg mkdir cp ping grep \ |
|
|
|
@ -354,17 +374,14 @@ EOF |
|
|
|
done |
|
|
|
done |
|
|
|
|
|
|
|
|
|
|
|
cp -a /etc/ld.so.conf* $initdir/etc |
|
|
|
cp -a /etc/ld.so.conf* $initdir/etc |
|
|
|
sudo ldconfig -r "$initdir" |
|
|
|
ldconfig -r "$initdir" |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
sudo umount $TESTDIR/mnt |
|
|
|
umount $TESTDIR/mnt |
|
|
|
rm -fr -- $TESTDIR/mnt |
|
|
|
rm -fr -- $TESTDIR/mnt |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
test_setup() { |
|
|
|
test_setup() { |
|
|
|
|
|
|
|
|
|
|
|
modinfo nbd &>/dev/null || { echo "Kernel does not support nbd"; exit 1; } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
make_encrypted_root || return 1 |
|
|
|
make_encrypted_root || return 1 |
|
|
|
make_client_root || return 1 |
|
|
|
make_client_root || return 1 |
|
|
|
make_server_root || return 1 |
|
|
|
make_server_root || return 1 |
|
|
|
@ -373,7 +390,7 @@ test_setup() { |
|
|
|
( |
|
|
|
( |
|
|
|
export initdir=$TESTDIR/overlay |
|
|
|
export initdir=$TESTDIR/overlay |
|
|
|
. $basedir/dracut-init.sh |
|
|
|
. $basedir/dracut-init.sh |
|
|
|
inst_multiple poweroff shutdown |
|
|
|
inst_multiple poweroff shutdown dd |
|
|
|
inst_hook shutdown-emergency 000 ./hard-off.sh |
|
|
|
inst_hook shutdown-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 |
|
|
|
inst ./cryptroot-ask.sh /sbin/cryptroot-ask |
|
|
|
inst ./cryptroot-ask.sh /sbin/cryptroot-ask |
|
|
|
@ -388,13 +405,13 @@ test_setup() { |
|
|
|
echo -n test > $initdir/etc/key |
|
|
|
echo -n test > $initdir/etc/key |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ |
|
|
|
$basedir/dracut.sh -l -i $TESTDIR/overlay / \ |
|
|
|
-m "dash udev-rules rootfs-block fs-lib base debug kernel-modules" \ |
|
|
|
-m "dash udev-rules rootfs-block fs-lib base debug kernel-modules" \ |
|
|
|
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \ |
|
|
|
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \ |
|
|
|
--no-hostonly-cmdline -N \ |
|
|
|
--no-hostonly-cmdline -N \ |
|
|
|
-f $TESTDIR/initramfs.server $KVERSION || return 1 |
|
|
|
-f $TESTDIR/initramfs.server $KVERSION || return 1 |
|
|
|
|
|
|
|
|
|
|
|
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ |
|
|
|
$basedir/dracut.sh -l -i $TESTDIR/overlay / \ |
|
|
|
-o "plymouth" \ |
|
|
|
-o "plymouth" \ |
|
|
|
-a "debug watchdog" \ |
|
|
|
-a "debug watchdog" \ |
|
|
|
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esb ib700wdt" \ |
|
|
|
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000 i6300esb ib700wdt" \ |
|
|
|
@ -404,7 +421,7 @@ test_setup() { |
|
|
|
|
|
|
|
|
|
|
|
kill_server() { |
|
|
|
kill_server() { |
|
|
|
if [[ -s $TESTDIR/server.pid ]]; then |
|
|
|
if [[ -s $TESTDIR/server.pid ]]; then |
|
|
|
sudo kill -TERM $(cat $TESTDIR/server.pid) |
|
|
|
kill -TERM $(cat $TESTDIR/server.pid) |
|
|
|
rm -f -- $TESTDIR/server.pid |
|
|
|
rm -f -- $TESTDIR/server.pid |
|
|
|
fi |
|
|
|
fi |
|
|
|
} |
|
|
|
} |
|
|
|
|
Daniel Molkentin
5 years ago
committed by