X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.mlab%2Fsliceimage.post;h=262a2ffe0e03fcff48bcf84d4765eb243ebaf83f;hb=1f91236d83fb7d5aec6ac6832ad3f6fa67c36ed9;hp=dabcc1e13681838ab416c862bd3eb838cc021d02;hpb=dd88fed790f12c1ca09f356b25bcc7837f8d5333;p=build.git

diff --git a/config.mlab/sliceimage.post b/config.mlab/sliceimage.post
index dabcc1e1..262a2ffe 100644
--- a/config.mlab/sliceimage.post
+++ b/config.mlab/sliceimage.post
@@ -16,9 +16,29 @@ sed -i -e "s/root:[\*|x]/root:/" ${vdir}/etc/passwd
 echo "in slice image: removing requiretty from /etc/sudoers"
 sed -i -e 's,^\(Defaults.*requiretty\),#\1,' ${vdir}/etc/sudoers
 
+# disable Upstart by creating a symlink to /bin/true
+#mv ${vdir}/sbin/initctl ${vdir}/sbin/initctl.orig
+chroot ${vdir} mv /sbin/initctl /sbin/initctl.orig
+chroot ${vdir} ln /bin/true /sbin/initctl 
+
 # Fix up /etc/init.d/halt 
+# xxx this would be wrong in f>=16 because there's no /sbin anymore
+# but I suspect this is for vserver only..
 echo "in slice image: fixing /etc/init.d/halt"
 cat > ${vdir}/etc/init.d/halt <<EOF
 #!/bin/bash
 exec /sbin/killall5 -15
 EOF
+
+# make sure we do not end up with an empty /selinux 
+# libvirt gets all confused when that happens
+cd ${vdir}
+if [ -d selinux ] ; then
+    if [ "$(ls -A selinux)" ] ; then
+	echo "sliceimage.post: WARNING: ${vdir}/selinux is not empty - preserving"
+    else
+	echo "sliceimage.post: REMOVING empty ${vdir}/selinux"
+	rmdir selinux
+    fi
+fi
+cd -