Changeset a44ae577 for bootscripts/lfs/init.d

Timestamp:

09/07/2021 09:01:23 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

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, 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:

408fb782

Parents:

e7fb2ca

Message:

Remove spaces at end of lines - bootscripts

Location:

bootscripts/lfs/init.d

Files:

• checkfs (modified) (4 diffs)
• cleanfs (modified) (4 diffs)
• console (modified) (4 diffs)
• modules (modified) (3 diffs)
• mountvirtfs (modified) (2 diffs)
• network (modified) (1 diff)
• rc (modified) (5 diffs)
• setclock (modified) (1 diff)
• swap (modified) (1 diff)
• udev (modified) (1 diff)
• udev_retry (modified) (3 diffs)

bootscripts/lfs/init.d/checkfs

@@ -62 +62 @@
          log_failure_msg "${msg}"
 
-         log_info_msg "Press Enter to continue..." 
+         log_info_msg "Press Enter to continue..."
          wait_for_user
          /etc/rc.d/init.d/halt stop
@@ -70 +70 @@
 
       if [ -f /forcefsck ]; then
-         msg="/forcefsck found, forcing file" 
+         msg="/forcefsck found, forcing file"
          msg="${msg} system checks as requested."
          log_success_msg "$msg"
@@ -109 +109 @@
          log_failure_msg "$msg"
 
-         log_info_msg "Press Enter to continue..." 
+         log_info_msg "Press Enter to continue..."
          wait_for_user
          reboot -f
@@ -126 +126 @@
          log_failure_msg "$msg"
 
-         log_info_msg "Press Enter to continue..." 
+         log_info_msg "Press Enter to continue..."
          wait_for_user
          /etc/rc.d/init.d/halt stop

bootscripts/lfs/init.d/cleanfs

@@ -23 +23 @@
 # Short-Description:   Cleans temporary directories early in the boot process.
 # Description:         Cleans temporary directories /run, /var/lock, and
-#                      optionally, /tmp.  cleanfs also creates /run/utmp 
+#                      optionally, /tmp.  cleanfs also creates /run/utmp
 #                      and any files defined in /etc/sysconfig/createfiles.
 # X-LFS-Provided-By:   LFS
@@ -31 +31 @@
 
 # Function to create files/directory on boot.
-create_files() 
+create_files()
 {
    # Input to file descriptor 9 and output to stdin (redirection)
@@ -64 +64 @@
                      mknod "${name}" p
                      ;;
-                  *) 
-                     log_warning_msg "\nUnknown device type: ${dtype}" 
+                  *)
+                     log_warning_msg "\nUnknown device type: ${dtype}"
                      ;;
                esac
                ;;
             *)
-               log_warning_msg "\nUnknown type: ${type}" 
+               log_warning_msg "\nUnknown type: ${type}"
                continue
                ;;
@@ -88 +88 @@
 case "${1}" in
    start)
-      log_info_msg "Cleaning file systems:" 
+      log_info_msg "Cleaning file systems:"
 
       if [ "${SKIPTMPCLEAN}" = "" ]; then
-         log_info_msg2 " /tmp" 
+         log_info_msg2 " /tmp"
          cd /tmp &&
          find . -xdev -mindepth 1 ! -name lost+found -delete || failed=1

bootscripts/lfs/init.d/console

@@ -33 +33 @@
 [ -r /etc/sysconfig/console ] && . /etc/sysconfig/console
 
-is_true() 
+is_true()
 {
    [ "$1" = "1" ] || [ "$1" = "yes" ] || [ "$1" = "true" ]
@@ -44 +44 @@
       # See if we need to do anything
       if [ -z "${KEYMAP}"         ] && [ -z "${KEYMAP_CORRECTIONS}" ] &&
-         [ -z "${FONT}"           ] && [ -z "${LEGACY_CHARSET}"     ] &&     
-         ! is_true "${UNICODE}"; then 
+         [ -z "${FONT}"           ] && [ -z "${LEGACY_CHARSET}"     ] &&
+         ! is_true "${UNICODE}"; then
          exit 0
       fi
@@ -86 +86 @@
          loadkeys ${KEYMAP} >/dev/null 2>&1 ||
          failed=1
-      
+
       [ -z "${KEYMAP_CORRECTIONS}" ] ||
          loadkeys ${KEYMAP_CORRECTIONS} >/dev/null 2>&1 ||
@@ -98 +98 @@
       # If any of the commands above failed, the trap at the
       # top would set $failed to 1
-      ( exit $failed ) 
+      ( exit $failed )
       evaluate_retval
 
       exit $failed
-      ;;              
+      ;;
 
-   *)                 
+   *)
       echo "Usage:  ${0} {start}"
-      exit 1          
-      ;;              
+      exit 1
+      ;;
 esac
 

bootscripts/lfs/init.d/modules

@@ -38 +38 @@
       egrep -qv '^($|#)' /etc/sysconfig/modules || exit 0
 
-      log_info_msg "Loading modules:" 
+      log_info_msg "Loading modules:"
 
       # Only try to load modules if the user has actually given us
@@ -55 +55 @@
          # Print the module name if successful, otherwise take note.
          if [ $? -eq 0 ]; then
-            log_info_msg2 " ${module}" 
+            log_info_msg2 " ${module}"
          else
             failedmod="${failedmod} ${module}"
@@ -64 +64 @@
       log_success_msg2
 
-      # Print a failure message with a list of any modules that 
+      # Print a failure message with a list of any modules that
       # may have failed to load.
       if [ -n "${failedmod}" ]; then
-         log_failure_msg "Failed to load modules:${failedmod}" 
+         log_failure_msg "Failed to load modules:${failedmod}"
          exit 1
       fi

bootscripts/lfs/init.d/mountvirtfs

@@ -40 +40 @@
       chmod 1777 /run/shm /run/lock
 
-      log_info_msg "Mounting virtual file systems: ${INFO}/run" 
+      log_info_msg "Mounting virtual file systems: ${INFO}/run"
 
       if ! mountpoint /proc >/dev/null; then
@@ -48 +48 @@
 
       if ! mountpoint /sys >/dev/null; then
-         log_info_msg2 " ${INFO}/sys" 
+         log_info_msg2 " ${INFO}/sys"
          mount -o nosuid,noexec,nodev /sys || failed=1
       fi
 
       if ! mountpoint /dev >/dev/null; then
-         log_info_msg2 " ${INFO}/dev" 
+         log_info_msg2 " ${INFO}/dev"
          mount -o mode=0755,nosuid /dev  || failed=1
       fi
 
       ln -sfn /run/shm /dev/shm
-      
+
       (exit ${failed})
       evaluate_retval

bootscripts/lfs/init.d/network

@@ -44 +44 @@
    stop)
       # Unmount any network mounted file systems
-       umount --all --force --types nfs,cifs,nfs4 
+       umount --all --force --types nfs,cifs,nfs4
 
       # Reverse list

bootscripts/lfs/init.d/rc

@@ -19 +19 @@
    log_failure_msg
    # $i is set when called
-   MSG="FAILURE:\n\nYou should not be reading this error message.\n\n" 
+   MSG="FAILURE:\n\nYou should not be reading this error message.\n\n"
    MSG="${MSG}It means that an unforeseen error took place in\n"
    MSG="${MSG}${i},\n"
    MSG="${MSG}which exited with a return value of ${error_value}.\n"
-  
+
    MSG="${MSG}If you're able to track this error down to a bug in one of\n"
    MSG="${MSG}the files provided by the ${DISTRO_MINI} book,\n"
@@ -37 +37 @@
    # $i is set when called
    if [ ! -f ${i} ]; then
-      log_warning_msg "${i} is not a valid symlink." 
+      log_warning_msg "${i} is not a valid symlink."
       SCRIPT_STAT="1"
    fi
@@ -103 +103 @@
 
 if [ ! -d /etc/rc.d/rc${runlevel}.d ]; then
-   log_info_msg "/etc/rc.d/rc${runlevel}.d does not exist.\n" 
+   log_info_msg "/etc/rc.d/rc${runlevel}.d does not exist.\n"
    exit 1
 fi
@@ -110 +110 @@
 
 # Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7
-if [ "$runlevel" == "S" ]; then 
-   [ -r /etc/sysconfig/console ] && source /etc/sysconfig/console 
-   dmesg -n "${LOGLEVEL:-7}" 
+if [ "$runlevel" == "S" ]; then
+   [ -r /etc/sysconfig/console ] && source /etc/sysconfig/console
+   dmesg -n "${LOGLEVEL:-7}"
 fi
 
@@ -226 +226 @@
 if [ "${previous}" == "N" -a  "${runlevel}" != "S" ]; then
    cat $BOOTLOG >> /var/log/boot.log
-      
+
    # Mark the end of boot
    echo "--------" >> /var/log/boot.log
-   
+
    # Remove the temporary file
    rm -f $BOOTLOG 2> /dev/null

bootscripts/lfs/init.d/setclock

@@ -14 +14 @@
 
 ### BEGIN INIT INFO
-# Provides:            
+# Provides:
 # Required-Start:
 # Should-Start:        modules

bootscripts/lfs/init.d/swap

@@ -49 +49 @@
 
    status)
-      log_success_msg "Retrieving swap status." 
+      log_success_msg "Retrieving swap status."
       swapon -s
       ;;

bootscripts/lfs/init.d/udev

@@ -61 +61 @@
       # If any LVM based partitions are on the system, ensure they
       # are activated so they can be used.
-      if [ -x /sbin/vgchange ]; then /sbin/vgchange -a y >/dev/null; fi 
+      if [ -x /sbin/vgchange ]; then /sbin/vgchange -a y >/dev/null; fi
 
-      log_success_msg2 
+      log_success_msg2
       ;;
 

bootscripts/lfs/init.d/udev_retry

@@ -8 +8 @@
 #               DJ Lucas - dj@linuxfromscratch.org
 # Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
-#               Bryan Kadzban - 
+#               Bryan Kadzban -
 #
 # Version     : LFS 7.0
@@ -40 +40 @@
       # From Debian: "copy the rules generated before / was mounted
       # read-write":
-    
+
       for file in ${rundir}/tmp-rules--*; do
          dest=${file##*tmp-rules--}
@@ -48 +48 @@
       done
 
-      # Re-trigger the uevents that may have failed, 
+      # Re-trigger the uevents that may have failed,
       # in hope they will succeed now
       /bin/sed -e 's/#.*$//' /etc/sysconfig/udev_retry | /bin/grep -v '^$' | \