Changeset 02776dff for bootscripts

Timestamp:

01/13/2021 08:44:28 AM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

704e800

Parents:

a892a14

Message:

use /run for runtime state directories

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12093 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

bootscripts

Files:

• ChangeLog (modified) (1 diff)
• lfs/init.d/cleanfs (modified) (2 diffs)
• lfs/init.d/rc (modified) (2 diffs)
• lfs/lib/services/init-functions (modified) (3 diffs)

bootscripts/ChangeLog

@@ +1 @@
+2021-01-13 Xi Ruoyao <xry111@mengyan1223.wang>
+   * Use /run instead of deprecated /var/run
+
 2020-10-02 DJ Lucas <dj@linuxfromscratch.org>
    * make $local_fs a Should-Stop dependency of swap to allow clean install

bootscripts/lfs/init.d/cleanfs

@@ -22 +22 @@
 # Default-Stop:
 # Short-Description:   Cleans temporary directories early in the boot process.
-# Description:         Cleans temporary directories /var/run, /var/lock, and
-#                      optionally, /tmp.  cleanfs also creates /var/run/utmp 
+# Description:         Cleans temporary directories /run, /var/lock, and
+#                      optionally, /tmp.  cleanfs also creates /run/utmp 
 #                      and any files defined in /etc/sysconfig/createfiles.
 # X-LFS-Provided-By:   LFS
@@ -96 +96 @@
       fi
 
-      > /var/run/utmp
+      > /run/utmp
 
       if grep -q '^utmp:' /etc/group ; then
-         chmod 664 /var/run/utmp
-         chgrp utmp /var/run/utmp
+         chmod 664 /run/utmp
+         chgrp utmp /run/utmp
       fi
 

bootscripts/lfs/init.d/rc

@@ -143 +143 @@
 
 # Read the state file if it exists from runlevel S
-[ -r /var/run/interactive ] && source /var/run/interactive
+[ -r /run/interactive ] && source /run/interactive
 
 # Attempt to stop all services started by the previous runlevel,
@@ -218 +218 @@
 # Store interactive variable on switch from runlevel S and remove if not
 if [ "${runlevel}" == "S" -a "${interactive}" == "i" ]; then
-    echo "interactive=\"i\"" > /var/run/interactive
+    echo "interactive=\"i\"" > /run/interactive
 else
-    rm -f /var/run/interactive 2> /dev/null
+    rm -f /run/interactive 2> /dev/null
 fi
 

bootscripts/lfs/lib/services/init-functions

@@ -359 +359 @@
             progname=`echo "${program}" | sed "s@${prefix}@@"`
 
-            if [ -e "/var/run/${progname}.pid" ]; then
-                rm -f "/var/run/${progname}.pid" 2> /dev/null
+            if [ -e "/run/${progname}.pid" ]; then
+                rm -f "/run/${progname}.pid" 2> /dev/null
             fi
         else
@@ -435 +435 @@
 
         # If a PID file exists with that name, assume that is it.
-        if [ -e "/var/run/${progname}.pid" ]; then
-            pidfile="/var/run/${progname}.pid"
+        if [ -e "/run/${progname}.pid" ]; then
+            pidfile="/run/${progname}.pid"
         fi
     fi
@@ -529 +529 @@
          "ID(s) ${pidlist}.${NORMAL}"
    else
-      if [ -n "${base}" -a -e "/var/run/${base}.pid" ]; then
+      if [ -n "${base}" -a -e "/run/${base}.pid" ]; then
          /bin/echo -e "${WARNING}${1} is not running but" \
-            "/var/run/${base}.pid exists.${NORMAL}"
+            "/run/${base}.pid exists.${NORMAL}"
       else
          if [ -n "${pidfile}" -a -e "${pidfile}" ]; then