From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 31 Jan 2011 12:26:41 +0000 (+0100)
Subject: bugfix - was wrong
X-Git-Tag: 5.0-rc18~21
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0a9f8065a3e0216c5ae8f865bc0edc6e29f88801;p=build.git

bugfix - was wrong
---

diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index 5149e9e9..a5d79e90 100644
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -28,7 +28,12 @@ chroot ${vdir} /sbin/chkconfig vprocunhide on || :
 # turn OFF selinux if set
 if [ -f ${vdir}/etc/sysconfig/selinux ] ; then
     selinuxrpm=$(chroot ${vdir} rpm -qf /etc/sysconfig/selinux)
-    chroot ${vdir} rpm -e --nodeps ${rpm}
+    if [ -z "$selinuxrpm" ] ; then 
+	echo WARNING : could not turn off SElinux
+    else
+	echo "Force-removing package ${selinuxrpm}" 
+	chroot ${vdir} rpm -e --nodeps ${selinuxrpm}
+    fi
 fi
 
 # Disable splaying of cron.