Changeset 609a9e7 in bootscripts-standard for bootscripts/clfs

Timestamp:

May 15, 2014, 11:50:36 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master

Children:

8b29156

Parents:

84f3ac2

Message:

Bring bootscripts up to date with 2.0-pre1

Location:

bootscripts/clfs/init.d

Files:

• cleanfs (modified) (2 diffs)
• functions.minimal (moved) (moved from clfs/init.d/functions ) (1 diff)
• mountfs (modified) (1 diff)
• mountkernfs (modified) (1 diff)
• sendsignals (modified) (2 diffs)
• udev (modified) (3 diffs, 1 prop)

bootscripts/clfs/init.d/cleanfs

@@ -79 +79 @@
                         -delete || failed=1
 
-                boot_mesg -n " /var/lock" ${NORMAL}
-                cd /var/lock &&
-                find . -type f ! -newer /proc -exec rm -f {} \; || failed=1
-
-                boot_mesg " /var/run" ${NORMAL}
-                cd /var/run &&
-                find . ! -type d ! -name utmp ! -newer /proc \
-                        -exec rm -f {} \; || failed=1
                 > /var/run/utmp
                 if grep -q '^utmp:' /etc/group ; then
@@ -95 +87 @@
                 (exit ${failed})
                 evaluate_retval
-
+                boot_mesg "" ${NORMAL}
                 if [ -e /etc/sysconfig/createfiles ]; then
                         if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then

bootscripts/clfs/init.d/functions.minimal

@@ -27 +27 @@
 # Setup default values for environment
 umask 022
-export PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+export PATH="/tools/bin:/tools/sbin:/bin:/sbin"
 
 # Signal sent to running processes to refresh their configuration

bootscripts/clfs/init.d/mountfs

@@ -30 +30 @@
                 mount -f /proc || failed=1
                 mount -f /sys || failed=1
+                mount -f /run || failed=1
+                mount -f /dev || failed=1
                 (exit ${failed})
                 evaluate_retval

bootscripts/clfs/init.d/mountkernfs

@@ -22 +22 @@
                 if ! mountpoint /proc >/dev/null; then
                         boot_mesg -n " /proc" ${NORMAL}
-                        mount -n /proc || failed=1
+                        mount -n -o nosuid,noexec,nodev -t proc proc /proc || failed=1
                 fi
 
                 if ! mountpoint /sys >/dev/null; then
                         boot_mesg -n " /sys" ${NORMAL}
-                        mount -n /sys || failed=1
+                        mount -n -o nosuid,noexec,nodev -t sysfs sys /sys || failed=1
                 fi
-
-                boot_mesg "" ${NORMAL}
-
+                if ! mountpoint /run >/dev/null; then
+                        boot_mesg -n " /run" ${NORMAL}
+                        mount -n -o mode=0755,nosuid,nodev -t tmpfs run /run || failed=1
+                fi
+                if ! mountpoint /dev >/dev/null; then
+                        boot_mesg -n " /dev" ${NORMAL}
+                        mount -n -o mode=0755,nosuid -t devtmpfs dev /dev || failed=1
+                fi
                 (exit ${failed})
-                evaluate_retval
+                                        
+                mkdir -m 1777 /run/lock
+                mkdir -p /dev/{pts,shm}           
                 ;;
 

bootscripts/clfs/init.d/sendsignals

@@ -24 +24 @@
                 sleep ${KILLDELAY}
 
-                if [ "${error_value}" = 0 ]; then
+                if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
                         echo_ok
                 else
@@ -36 +36 @@
                 sleep ${KILLDELAY}
 
-                if [ "${error_value}" = 0 ]; then
+                if [ "${error_value}" = 0 -o "${error_value}" = 2 ]; then
                         echo_ok
                 else

bootscripts/clfs/init.d/udev

@@ -22 +22 @@
 case "$1" in
     start)
-        boot_mesg "Creating /dev in tmpfs..."
-        mount -n -t tmpfs -o mode=0755 udev /dev
-        evaluate_retval
-
-        boot_mesg "Copying static entries..."
-        cp --preserve=all --recursive --remove-destination /lib/udev/devices/* /dev
-        evaluate_retval
-        
-        boot_mesg "Setting Permissons on /dev/shm..."
-        chmod 1777 /dev/shm
-        evaluate_retval
-
         echo "" > /sys/kernel/uevent_helper
 
         # start udevd
-        boot_mesg "Starting udevd..."
+        boot_mesg "\nStarting udevd..."
         /sbin/udevd --daemon
         evaluate_retval
@@ -45 +33 @@
 
         # unlikely, but we may be faster than the first event
-        mkdir -p /dev/.udev/queue
+        #mkdir -p /run/.udev/queue
 
         # configure all devices
-        /sbin/udevadm trigger
+        /sbin/udevadm trigger --action=add --type=subsystems
+        /sbin/udevadm trigger --action=add --type=devices
         
         # this replaces the old loop, exits after all devices are done
@@ -72 +61 @@
         ;;
 
-    reload)
-        boot_mesg "Reloading udev rules..."
-        udevadm control reload_rules
-        cp --preserve=all --recursive --update /lib/udev/devices/* /dev
-        evaluate_retval
-        ;;
-
-    force-reload)
-        boot_mesg "Updating all available device nodes in /dev..."
-        udevadm control reload_rules
-        rm -rf /dev/.udev /dev/disk
-        cp --preserve=all --recursive --update /lib/udev/devices/* /dev
-        /sbin/udevadm trigger
-        /sbin/udevadm settle
-        evaluate_retval
-        ;;
-
     *)
         echo "Usage: $0 {start|stop|restart|status|reload|force-reload}"