From: S.Çağlar Onur <caglar@verivue.com>
Date: Thu, 17 Mar 2011 17:32:26 +0000 (-0400)
Subject: man 5 passwd states following;
X-Git-Tag: 5.0-rc21~22
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cfdf17001304aa826b89248cf599f18c8dde51d5;p=build.git

man 5 passwd states following;

[...]
password  the encrypted user password, an asterisk (*), or the letter 'x'.  (See pwconv(8) for an explanation of 'x'.)
[...]

so handle both situation
---

diff --git a/config.planetlab/vserver.post b/config.planetlab/vserver.post
index def0615f..7d518f44 100644
--- a/config.planetlab/vserver.post
+++ b/config.planetlab/vserver.post
@@ -10,7 +10,7 @@ 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"