initscripts: Mount /var/lock after all other FSes have been mounted.

For example /var/lock does not exist, yet when mountkernfs is
called.

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 7a4e41b7da613d8477bbb9a02939a832ac08b80e..980441599ec703d158feed8e74cbddf3b5c33077 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -54,6 +54,7 @@ etc/rc.d/init.d/modules
 #etc/rc.d/init.d/motion
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
+etc/rc.d/init.d/mounttmpfs
 #etc/rc.d/init.d/mpd
 #etc/rc.d/init.d/mysql
 #etc/rc.d/init.d/netsnmpd
@@ -217,6 +218,7 @@ etc/rc.d/rcsysinit.d/S25partresize
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
 etc/rc.d/rcsysinit.d/S42fsresize
+etc/rc.d/rcsysinit.d/S43mounttmpfs
 etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 529bcc9c0a354476e1df37139861a38a9e41ad0a..d0bc8c5c20dfc0dfe53ceaaec6ab33fc9da60ee6 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -56,6 +56,7 @@ etc/rc.d/init.d/modules
 #etc/rc.d/init.d/motion
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
+etc/rc.d/init.d/mounttmpfs
 #etc/rc.d/init.d/mpd
 #etc/rc.d/init.d/mysql
 #etc/rc.d/init.d/netsnmpd
@@ -224,6 +225,7 @@ etc/rc.d/rcsysinit.d/S25partresize
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs
 etc/rc.d/rcsysinit.d/S42fsresize
+etc/rc.d/rcsysinit.d/S43mounttmpfs
 etc/rc.d/rcsysinit.d/S45udev_retry
 etc/rc.d/rcsysinit.d/S50cleanfs
 etc/rc.d/rcsysinit.d/S60setclock

diff --git a/lfs/initscripts b/lfs/initscripts
index c5fe54f8245ad9adeebe488b08ecfe86496c7e69..4894710ac371923dc6c0921723e69593fbb9f726 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -166,6 +166,7 @@ $(TARGET) :
        ln -sf ../init.d/checkfs     /etc/rc.d/rcsysinit.d/S30checkfs
        ln -sf ../init.d/mountfs     /etc/rc.d/rcsysinit.d/S40mountfs
        ln -sf ../init.d/fsresize    /etc/rc.d/rcsysinit.d/S42fsresize
+       ln -sf ../init.d/mounttmpfs  /etc/rc.d/rcsysinit.d/S43mounttmpfs
        ln -sf ../init.d/udev_retry  /etc/rc.d/rcsysinit.d/S45udev_retry
        ln -sf ../init.d/cleanfs     /etc/rc.d/rcsysinit.d/S50cleanfs
        ln -sf ../init.d/setclock    /etc/rc.d/rcsysinit.d/S60setclock

diff --git a/src/initscripts/init.d/mountkernfs b/src/initscripts/init.d/mountkernfs
index 05e8eb67aa6e46f52f8fb1de1feb6106b50e6d1f..f7be82d01e5097e158a8cf032743f756d196ebdc 100644 (file)
--- a/src/initscripts/init.d/mountkernfs
+++ b/src/initscripts/init.d/mountkernfs
@@ -34,11 +34,6 @@ case "${1}" in
                        mount -n -t tmpfs -o nosuid,nodev,mode=755,size=8M /run /run || failed=1
                fi
 
-               if ! mountpoint /var/lock &>/dev/null; then
-                       boot_mesg -n " /var/lock" ${NORMAL}
-                       mount -n -t tmpfs -o nosuid,nodev,size=8M /var/lock /var/lock || failed=1
-               fi
-
                boot_mesg "" ${NORMAL}
 
                (exit ${failed})

diff --git a/src/initscripts/init.d/mounttmpfs b/src/initscripts/init.d/mounttmpfs
new file mode 100644 (file)
index 0000000..9ec8c3a
--- /dev/null
+++ b/src/initscripts/init.d/mounttmpfs
@@ -0,0 +1,33 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/mounttmpfs
+#
+# Description : Mount tmpfses
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+               boot_mesg -n "Mounting ramdisk file systems:" ${INFO}
+
+               if ! mountpoint /var/lock &>/dev/null; then
+                       boot_mesg -n " /var/lock" ${NORMAL}
+                       mount -n -t tmpfs -o nosuid,nodev,size=8M /var/lock /var/lock || failed=1
+               fi
+
+               boot_mesg "" ${NORMAL}
+
+               (exit ${failed})
+               evaluate_retval
+               ;;
+
+       *)
+               echo "Usage: ${0} {start}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/mounttmpfs