[Fusionforge-commits] r12654 - trunk/tests/lxc
Christian Bayle
cbayle at fusionforge.org
Thu Mar 10 17:13:34 CET 2011
Author: cbayle
Date: 2011-03-10 17:13:34 +0100 (Thu, 10 Mar 2011)
New Revision: 12654
Modified:
trunk/tests/lxc/lxc-centos5
trunk/tests/lxc/lxc-debian6
Log:
fix avahi not starting twice
Modified: trunk/tests/lxc/lxc-centos5
===================================================================
--- trunk/tests/lxc/lxc-centos5 2011-03-10 16:13:23 UTC (rev 12653)
+++ trunk/tests/lxc/lxc-centos5 2011-03-10 16:13:34 UTC (rev 12654)
@@ -129,6 +129,14 @@
sed -i -e '/start_udev/d' $rootfs/etc/rc.d/rc.sysinit
+ # fix avahi
+ if [ -f $rootfs/etc/init.d/avahi-daemon ]
+ then
+ echo 'Fix avahi'
+ sed -i -e "s!-D!-D --no-rlimits!" $rootfs/etc/init.d/avahi-daemon
+ fi
+
+
#rm -f $rootfs/etc/mtab
#ln -s /proc/mounts $rootfs/etc/mtab
Modified: trunk/tests/lxc/lxc-debian6
===================================================================
--- trunk/tests/lxc/lxc-debian6 2011-03-10 16:13:23 UTC (rev 12653)
+++ trunk/tests/lxc/lxc-debian6 2011-03-10 16:13:34 UTC (rev 12654)
@@ -89,6 +89,13 @@
chroot $rootfs /usr/sbin/update-rc.d -f hwclock.sh remove
chroot $rootfs /usr/sbin/update-rc.d -f hwclockfirst.sh remove
+ # fix avahi
+ if [ -f $rootfs/etc/init.d/avahi-daemon ]
+ then
+ echo 'Fix avahi'
+ sed -i -e "s!-D!-D --no-rlimits!" $rootfs/etc/init.d/avahi-daemon
+ fi
+
echo "root:root" | chroot $rootfs chpasswd
echo "Root password is 'root', please change !"
More information about the Fusionforge-commits
mailing list