rc-scripts/trunk/rc.d: init.d/functions rc.sysinit

[baggins]

Author: baggins
Date: Thu Nov 24 16:25:41 2005
New Revision: 6563

Modified:
   rc-scripts/trunk/rc.d/init.d/functions
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- remove duplicate entries in vserver guest /etc/mtab


Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions	(original)
+++ rc-scripts/trunk/rc.d/init.d/functions	Thu Nov 24 16:25:41 2005
@@ -884,6 +884,16 @@
 	echo $SELINUX > $selinuxfs/enforce
 }
 
+# Remove duplicate entries from mtab (for vserver guest use only)
+clean_vserver_mtab() {
+	:>/etc/mtab.clean
+	cat /etc/mtab | while read device mountpoint line ; do
+		grep -qs "$mountpoint" /etc/mtab.clean || \
+			echo "$device $mountpoint $line" >> /etc/mtab.clean
+	done
+	mv -f /etc/mtab.clean /etc/mtab
+}
+
 #/*
 # * Local variables:
 # * mode: sh

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Thu Nov 24 16:25:41 2005
@@ -406,6 +406,8 @@
 	if grep -q cpuset /proc/filesystems 2>/dev/null ; then
 		mount -n -t cpuset none /dev/cpuset
 	fi
+else
+	clean_vserver_mtab
 fi
 
 # Remove /etc/nologin when starting system