Update master of plcapi.

[build.git] / config.planetlab / vserver.post

diff --git a/config.planetlab/vserver.post b/config.planetlab/vserver.post
index 1c650a8..7d518f4 100644 (file)
--- a/config.planetlab/vserver.post
+++ b/config.planetlab/vserver.post
@@ -10,8 +10,15 @@ fi
 
 # reset root password to be empty
 echo "Resetting root password in vserver-reference image"
-sed -i -e "s/root:\*/root:/" ${vdir}/etc/passwd
+sed -i -e "s/root:[\*|x]/root:/" ${vdir}/etc/passwd
 
 # modify the sudoers file to remove the 'requiretty' attribute
 echo "Removing requiretty from default /etc/sudoers file"
-sed -i -e "s/Defaults    requiretty/#Defaults    requiretty/" ${vdir}/etc/sudoers
+sed -i -e 's,^\(Defaults.*requiretty\),#\1,' ${vdir}/etc/sudoers
+
+# Fix up /etc/init.d/halt 
+echo "Fixing /etc/init.d/halt in vserver-reference image"
+cat > ${vdir}/etc/init.d/halt <<EOF
+#!/bin/bash
+exec /sbin/killall5 -15
+EOF