From: Marius Gavrilescu <marius@ieval.ro>
Date: Thu, 7 May 2015 16:49:12 +0000 (+0300)
Subject: Do not depend on bash logout and pass -n to poweroff (9p is sync,dirsync)
X-Git-Tag: 5999.000_005~12
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=4bc82f170161993315de80996861dc4a8d2ed3f3;p=gruntmaster-daemon.git

Do not depend on bash logout and pass -n to poweroff (9p is sync,dirsync)
---

diff --git a/ex/makevm b/ex/makevm
index b9ceaaa..efc3a21 100755
--- a/ex/makevm
+++ b/ex/makevm
@@ -4,7 +4,6 @@ mkdir -p vm/proc/
 mount /proc -o bind vm/proc
 multistrap -f ex/vm.conf
 ln -s vm/usr/bin/mawk vm/bin/awk
-echo '/sbin/poweroff -f' > vm/.bash_logout
 cat > vm/.profile <<EOF
 mount -t 9p -o trans=virtio virtfs /mnt
 mount -t ramfs ramfs /tmp
diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 6160a31..a492e63 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -30,7 +30,7 @@ sub runvm {
 	$vm{$name} = Expect::Simple->new({
 		Cmd => $cmd,
 		Prompt => '# ',
-		DisconnectCmd => 'exit',
+		DisconnectCmd => '/sbin/poweroff -fn',
 		RawPty => 1,
 		Timeout => 10,
 	});