kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TEST-50-MULTINIC: add watchdog

master
Harald Hoyer 2012-06-18 19:22:35 +02:00
parent 483b1e3aa8
commit 2dbd71b77a
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-50-MULTINIC/server-init.sh
View File

@ -26,6 +26,6 @@ dhcpd -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases
#sh -i #sh -i
# Wait forever for the VM to die # Wait forever for the VM to die
echo "Serving NFS mounts" echo "Serving NFS mounts"
while sleep 60; do sleep 60; done while sleep 30; do echo >/dev/watchdog; done
mount -n -o remount,ro / mount -n -o remount,ro /
poweroff -f poweroff -f

12
test/TEST-50-MULTINIC/test.sh
View File

@ -16,6 +16,7 @@ run_server() {
-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:12350 \ -net socket,listen=127.0.0.1:12350 \
-serial $SERIAL \ -serial $SERIAL \
-watchdog ib700 -watchdog-action poweroff \
-kernel /boot/vmlinuz-$KVERSION \ -kernel /boot/vmlinuz-$KVERSION \
-append "selinux=0 root=/dev/sda rd.debug rd.info rw quiet console=ttyS0,115200n81" \ -append "selinux=0 root=/dev/sda rd.debug rd.info rw quiet console=ttyS0,115200n81" \
-initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1 -initrd $TESTDIR/initramfs.server -pidfile $TESTDIR/server.pid -daemonize || return 1
@ -50,8 +51,9 @@ client_test() {
-net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \ -net nic,macaddr=52:54:00:12:34:$mac3,model=e1000 \
-net socket,connect=127.0.0.1:12350 \ -net socket,connect=127.0.0.1:12350 \
-hdc /dev/null \ -hdc /dev/null \
-watchdog ib700 -watchdog-action poweroff \
-kernel /boot/vmlinuz-$KVERSION \ -kernel /boot/vmlinuz-$KVERSION \
-append "$cmdline $DEBUGFAIL rd.retry=5 rd.debug rd.info ro quiet console=ttyS0,115200n81 selinux=0 rd.copystate" \ -append "$cmdline $DEBUGFAIL rd.retry=5 rd.debug rd.info ro quiet console=ttyS0,115200n81 selinux=0 rd.copystate rd.chroot init=/sbin/init" \
-initrd $TESTDIR/initramfs.testing -initrd $TESTDIR/initramfs.testing


if [[ $? -ne 0 ]] || ! grep -m 1 -q OK $TESTDIR/client.img; then if [[ $? -ne 0 ]] || ! grep -m 1 -q OK $TESTDIR/client.img; then
@ -261,15 +263,15 @@ test_setup() {


# Make server's dracut image # Make server's dracut image
$basedir/dracut.sh -l -i $TESTDIR/overlay / \ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-m "dash udev-rules base rootfs-block debug kernel-modules" \ -m "dash udev-rules base rootfs-block debug kernel-modules watchdog" \
-d "piix ide-gd_mod ata_piix ext3 sd_mod e1000" \ -d "piix ide-gd_mod ata_piix ext3 sd_mod e1000 ib700wdt" \
-f $TESTDIR/initramfs.server $KVERSION || return 1 -f $TESTDIR/initramfs.server $KVERSION || return 1


# Make client's dracut image # Make client's dracut image
$basedir/dracut.sh -l -i $TESTDIR/overlay / \ $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-o "plymouth" \ -o "plymouth" \
-a "debug" \ -a "debug watchdog" \
-d "piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfs sunrpc" \ -d "piix sd_mod sr_mod ata_piix ide-gd_mod e1000 nfs sunrpc ib700wdt" \
-f $TESTDIR/initramfs.testing $KVERSION || return 1 -f $TESTDIR/initramfs.testing $KVERSION || return 1
} }