Some tweaks

Author: makpif

ChangeLog

@@ -1,3 +1,9 @@
+2021-06-10 Dmitry Bashkatov <citokot@gmail.com>
+
+   * Sync
+   * Use short mount options to compatible with busybox
+   * Adapt to merged /usr/bin configuretion
+
 2021-04-28 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Make check_signal more robust. 
    * Use a better methog for killproc to remove a dead pid file.
@@ -1010,7 +1016,7 @@ n/a - February 19, 2004
 
    * Fixed checkfs script, so it will no longer continue to boot after a
      failure in the init.d/checkfs script.  Tested with the help of Andre
-     M�ller.  Fix suggested by Zack
+     Miller.  Fix suggested by Zack
 
 n/a - February 7, 2004
 

lfs/init.d/mountfs

@@ -33,7 +33,7 @@
 case "${1}" in
    start)
       log_info_msg "Remounting root file system in read-write mode..."
-      mount --options remount,rw / >/dev/null
+      mount -o remount,rw / >/dev/null
       evaluate_retval
 
       # Remove fsck-related file system watermarks.
@@ -47,7 +47,7 @@ case "${1}" in
 
       log_info_msg "Mounting remaining file systems..."
       failed=0
-      mount --all --test-opts no_netdev >/dev/null || failed=1
+      mount -a -O no_netdev >/dev/null || failed=1
       evaluate_retval
       exit $failed
       ;;
@@ -57,12 +57,12 @@ case "${1}" in
       log_info_msg "Unmounting all other currently mounted file systems..."
       # Ensure any loop devies are removed
       losetup -D
-      umount --all --detach-loop --read-only \
-             --types notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts >/dev/null
+      umount -a -d -r \
+             -t notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts >/dev/null
       evaluate_retval
 
       # Make sure / is mounted read only (umount bug)
-      mount --options remount,ro /
+      mount -o remount,ro /
 
       # Make all LVM volume groups unavailable, if appropriate
       # This fails if swap or / are on an LVM partition

lfs/init.d/network

@@ -35,10 +35,7 @@ case "${1}" in
          interface=${file##*/ifconfig.}
 
          # Skip if $file is * (because nothing was found)
-         if [ "${interface}" = "*" ]
-         then
-            continue
-         fi
+         if [ "${interface}" = "*" ]; then continue; fi
 
          /sbin/ifup ${interface}
       done
@@ -61,10 +58,14 @@ case "${1}" in
          interface=${file##*/ifconfig.}
 
          # Skip if $file is * (because nothing was found)
-         if [ "${interface}" = "*" ]
-         then
-            continue
-         fi
+         if [ "${interface}" = "*" ]; then continue; fi
+         
+         # See if interface exists
+         if [ ! -e /sys/class/net/$interface ]; then continue; fi
+         
+         # Is inerface UP?
+         ip link show $interface 2>/dev/null | grep -q "state UP"
+         if [ $? -ne 0 ];  then continue; fi
 
          /sbin/ifdown ${interface}
       done

lfs/lib/services/init-functions

@@ -21,7 +21,7 @@
 ## Environmental setup
 # Setup default values for environment
 umask 022
-export PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+export PATH="/usr/bin"
 
 ## Set color commands, used via echo
 # Please consult `man console_codes for more information