X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.planetlab%2Fsliceimage.post;h=1db1869d7ffc1d92860c826a504ed263286260e1;hb=7d6138cd60ad31d7be89c236e8aaa7e27596e45f;hp=dabcc1e13681838ab416c862bd3eb838cc021d02;hpb=ac2f5776f95568432bd1d8c8e10d17b667582b98;p=build.git

diff --git a/config.planetlab/sliceimage.post b/config.planetlab/sliceimage.post
index dabcc1e1..1db1869d 100644
--- a/config.planetlab/sliceimage.post
+++ b/config.planetlab/sliceimage.post
@@ -17,8 +17,32 @@ echo "in slice image: removing requiretty from /etc/sudoers"
 sed -i -e 's,^\(Defaults.*requiretty\),#\1,' ${vdir}/etc/sudoers
 
 # 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
+
+# for when runing under lxc, make sure we don't try to fsck from a slice
+sed -i -e 's,1 1,0 0,' ${vdir}/etc/fstab
+
+# a workaround for running f12 slices under f18; as per Andy findings, we
+# remove /etc/event.d/tty[23456] inside the slice image
+# this is not required in f>=16 since these files are upstart-specific anyway
+rm -f ${vdir}/etc/event.d/tty[23456]
+
+cd -