From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 1 Jun 2011 15:09:26 +0000 (+0200)
Subject: add capability for f15 guests
X-Git-Tag: 5.0-rc22~62
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ec030f9f67fda0190e8e7083281bf5cb58900e54;p=build.git

add capability for f15 guests
---

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 41d1dc06..808e02d8 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -154,18 +154,22 @@ function setup_vserver () {
     fi
 
     BCAPFILE=/etc/vservers/$vserver/bcapabilities
+    touch $BCAPFILE
     if [ -n "$VBUILD_MODE" ] ; then 
 	### capabilities required for a build vserver
         # set up appropriate vserver capabilities to mount, mknod and IPC_LOCK
-	touch $BCAPFILE
 	grep -q ^CAP_SYS_ADMIN $BCAPFILE || echo CAP_SYS_ADMIN >> $BCAPFILE
 	grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE
 	grep -q ^CAP_IPC_LOCK $BCAPFILE || echo CAP_IPC_LOCK >> $BCAPFILE
+	# useful for f15 guests that use set_cap_file 
+	grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE
     else
 	### capabilities required for a myplc vserver
 	# for /etc/plc.d/gpg - need to init /dev/random
 	grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE
 	grep -q ^CAP_NET_BIND_SERVICE $BCAPFILE || echo CAP_NET_BIND_SERVICE >> $BCAPFILE
+	# useful for f15 guests that use set_cap_file 
+	grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE
     fi
 
     # Set persistent for the network context