revert EARLY_MOUNTS since everything in the boot runlevel depends on localmount already and anything that runs before it does not rely on things like /tmp or /var/run (and because i confused localmount with checkroot)

4 files changed, 1 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index c03c3089..ead61b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,9 +6,6 @@
     Allow people to specify a list of dirs to clean in bootmisc #191807.  Force
     the +t bit on /tmp and /var/tmp paths.
 
-    Allow people to specify a list of early mount points which will be mounted
-    at the end of localmount so they can do tmpfs on things like /tmp #181527.
-
   04 Sep 2007; Roy Marples <uberlord@gentoo.org>:
 
     start-stop-daemon now works with userids correctly when a pidfile
diff --git a/conf.d.BSD/localmount b/conf.d.BSD/localmount
index 4deb27bf..2002beb6 100644
--- a/conf.d.BSD/localmount
+++ b/conf.d.BSD/localmount
@@ -1,6 +1,4 @@
-
-##############################################################################
-# BSD SPECIFIC OPTIONS
+# /etc/conf.d/localmount
 
 # Kernel core dump options for FreeBSD kernel.
 # Unless you're a FreeBSD kernel developer or driver writer then this won't
diff --git a/conf.d/localmount b/conf.d/localmount
deleted file mode 100644
index eae3c215..00000000
--- a/conf.d/localmount
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/conf.d/localmount
-
-# A list of mount points you want mounted before any other real
-# services get started.  For example, you may want to define /tmp
-# or /var/tmp as tmpfs mounts in your /etc/fstab and then add those
-# two paths here.
-EARLY_MOUNTS=""
diff --git a/init.d/localmount b/init.d/localmount
index 589ee072..06a1979f 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -143,12 +143,6 @@ start() {
 		eend $?
 	fi
 
-	for x in ${EARLY_MOUNTS} ; do
-		ebegin "Early mounting ${x}"
-		mount ${x}
-		eend $?
-	done
-
 	# Always return 0 - some local mounts may not be critical for boot
 	return 0
 }