SVN: rc-scripts/trunk/rc.d/rc.sysinit

[baggins]

Author: baggins
Date: Mon May 21 13:01:24 2012
New Revision: 12569

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- don't start udev or fsck / when running inside LXC container


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Mon May 21 13:01:24 2012
@@ -263,7 +263,7 @@
 		dmesg -n $CONSOLE_LOGLEVEL
 	fi
 
-	if ! is_no "$START_UDEV" && [ -x /sbin/start_udev ]; then
+	if ! is_no "$START_UDEV" && [ -x /sbin/start_udev ] && [[ "$container" != lxc* ]]; then
 		is_fsmounted devtmpfs /dev || mount -n -t devtmpfs devtmpfs /dev
 		load_kernel_modules modules.preudev
 		/sbin/start_udev
@@ -382,7 +382,7 @@
 	_ROOTFS_DEVICE=$(awk '($1 !~ /^#/ && $2 == "/" && NF >= 6) { print $1}' /etc/fstab)
 	_ROOTFS_TYPE=$(awk '$2 == "/" && $3 != "rootfs" { print $3 }' /proc/mounts 2>/dev/null)
 
-	if [ -z "$fastboot" -a "$_ROOTFS_TYPE" != "aufs" -a "$_ROOTFS_TYPE" != "nfs" -a "$_ROOTFS_TYPE" != "romfs" -a "$_ROOTFS_TYPE" != "squashfs" -a "$_ROOTFS_PASSNO" != 0 -a -e $_ROOTFS_DEVICE ]; then
+	if [ -z "$fastboot" -a "$_ROOTFS_TYPE" != "aufs" -a "$_ROOTFS_TYPE" != "nfs" -a "$_ROOTFS_TYPE" != "romfs" -a "$_ROOTFS_TYPE" != "squashfs" -a "$_ROOTFS_PASSNO" != 0 -a -e $_ROOTFS_DEVICE ] && [[ "$container" != lxc* ]]; then
 		check_root_fs
 	fi