Make guest ACPI shutdown work
authorReto Buerki <reet@codelabs.ch>
Wed, 16 Jan 2013 10:54:28 +0000 (11:54 +0100)
committerTobias Brunner <tobias@strongswan.org>
Thu, 17 Jan 2013 15:55:03 +0000 (16:55 +0100)
testing/scripts/build-baseimage
testing/stop-testing

index 691cc33..1355d7a 100755 (executable)
@@ -15,8 +15,8 @@ INC=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,ethtool
 INC=$INC,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc
 INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev
 INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
 INC=$INC,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc
 INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev
 INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
-INC=$INC,less
-SERVICES="isc-dhcp-server apache2 slapd"
+INC=$INC,less,acpid,acpi-support-base
+SERVICES="apache2 dbus isc-dhcp-server slapd"
 INC=$INC,${SERVICES// /,}
 EXC=iptables
 
 INC=$INC,${SERVICES// /,}
 EXC=iptables
 
index 013637a..704ae66 100755 (executable)
@@ -23,7 +23,7 @@ done
 for host in $STRONGSWANHOSTS
 do
        log_action "Guest $host"
 for host in $STRONGSWANHOSTS
 do
        log_action "Guest $host"
-       execute "virsh destroy $host"
+       execute "virsh shutdown $host"
        rm -f $VIRTIMGSTORE/$host.$IMGEXT
 done
 
        rm -f $VIRTIMGSTORE/$host.$IMGEXT
 done