here we tweak sliceimage.post so that we remove such empty /selinux from guest images
+++ /dev/null
-#!/bin/bash
-
-vdir=$1
-
-if [ -z "${vdir}" ] ; then
- echo "ERROR: $0"
- echo "Provide the directory of the root filesystem to operate on"
- exit
-fi
-
-# reset root password to be empty
-echo "in slice image: resetting root password"
-sed -i -e "s/root:[\*|x]/root:/" ${vdir}/etc/passwd
-
-# modify the sudoers file to remove the 'requiretty' attribute
-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
-echo "in slice image: fixing /etc/init.d/halt"
-cat > ${vdir}/etc/init.d/halt <<EOF
-#!/bin/bash
-exec /sbin/killall5 -15
-EOF
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
+cd -
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-13
bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@master
-sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-3
+sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@master
nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@nodeimage-5.2-1
myplc-GITPATH := git://git.planet-lab.org/myplc.git@master
# locating the right test directory - see make tests_gitpath
pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11
pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-16
bootcd-GITPATH := git://git.onelab.eu/bootcd.git@master
-sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-3
+sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@master
nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-1
myplc-GITPATH := git://git.onelab.eu/myplc.git@master
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1