From: Harald Hoyer <harald@redhat.com>
Date: Tue, 16 Oct 2012 14:20:33 +0000 (+0200)
Subject: TEST-04-FULL-SYSTEMD: fixed poweroff
X-Git-Tag: 024~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=665b7e58baccf26ccffc1961986271b5832d546e;p=thirdparty%2Fdracut.git

TEST-04-FULL-SYSTEMD: fixed poweroff
---

diff --git a/test/TEST-04-FULL-SYSTEMD/test-init.sh b/test/TEST-04-FULL-SYSTEMD/test-init.sh
index d41f0b041..cb7ce1274 100755
--- a/test/TEST-04-FULL-SYSTEMD/test-init.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test-init.sh
@@ -37,4 +37,6 @@ if strstr "$CMDLINE" "rd.shell"; then
 	strstr "$(setsid --help)" "control" && CTTY="-c"
 	setsid $CTTY sh -i
 fi
+set -x
+/usr/bin/systemctl poweroff
 echo "Powering down."
diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index d76f3d98a..8f91b32fd 100755
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -131,7 +131,6 @@ After=basic.target
 
 [Service]
 ExecStart=/sbin/test-init
-ExecStopPost=/usr/bin/systemctl poweroff
 Type=oneshot
 StandardInput=tty
 StandardOutput=tty
@@ -141,11 +140,12 @@ EOF
 
         # make the testsuite the default target
         ln -fs testsuite.target $initdir/etc/systemd/system/default.target
-        mkdir -p $initdir/etc/rc.d
-        cat >$initdir/etc/rc.d/rc.local <<EOF
-#!/bin/bash
-exit 0
-EOF
+
+#         mkdir -p $initdir/etc/rc.d
+#         cat >$initdir/etc/rc.d/rc.local <<EOF
+# #!/bin/bash
+# exit 0
+# EOF
 
         # install basic tools needed
         dracut_install sh bash setsid loadkeys setfont \
@@ -263,7 +263,7 @@ EOF
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
 	-a "debug watchdog systemd" \
         -o "network" \
-	-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esbwdt" \
+	-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
 	-f $TESTDIR/initramfs.testing $KVERSION || return 1
 
     rm -rf $TESTDIR/overlay