From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 4 Dec 2007 17:01:33 +0000 (+0000)
Subject: do not put linux64 into the /etc/vservers/<guest>/personality file
X-Git-Tag: 4.2-rc2~375
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a60e0d97efa9dca4988c523a1363026b53291fed;p=build.git

do not put linux64 into the /etc/vservers/<guest>/personality file
---

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 8b97c0f0..8d0fe101 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -85,8 +85,10 @@ function setup_vserver () {
     $personality vserver $VERBOSE $vserver build -m yum -- -d $fcdistro
 
     if [ ! -z "$personality" ] ; then
-	l32=$(grep $personality /etc/vservers/$vserver/personality | wc -l)
-	[ $l32 -eq 0 ] && echo $personality >> /etc/vservers/$vserver/personality
+	registered_personality=$(grep $personality /etc/vservers/$vserver/personality | wc -l)
+	if [ $registered_personality -eq 0 -a "$personality" != "linux64" ] ;
+	    echo $personality >> /etc/vservers/$vserver/personality
+	fi
     fi
 
     if [ -n "$VBUILD_MODE" ] ; then