TEST-04-FULL-SYSTEMD: fixed poweroff

master
Harald Hoyer 2012-10-16 16:20:33 +02:00
parent 1391a06d80
commit 665b7e58ba
2 changed files with 9 additions and 7 deletions

View File

@ -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."

View File

@ -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