Changeset f874424 for bootscripts/lfs/init.d/checkfs

Timestamp:

09/19/2011 03:31:46 AM (13 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 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, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, 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:

5a58876

Parents:

103bbd6

Message:

Rename /etc/sysconfig/init_params to /etc/sysconfig/rc.site.
Move network services to /lib/services.
Move init-functions to /lib/lsb.
Make /lib/lsb a symlink to /lib/services.
Create convenience symlink /etc/init.d->/etc/rc.d/init.d
Add help and man pages to ifup/ifdown.

Append /run/var/bootlog to /var/log/boot.log at the end of
the boot sequence.

Add capability to step through the boot scripts at boot time.

Optionally allow environment variables in sysconfig directory's
console, network, and clock files to be placed in rc.site.

Add an optional FASTBOOT parameter to set /fastboot when rebooting.

Remove a minor warning message from udev that is triggered
by the udev_retry boot script.

Add SKIPTMPCLEAN as an optional parameter to skip cleaning /tmp at boot time.

Add a page to Chapter 7 documenting rc.site.

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

File:

• bootscripts/lfs/init.d/checkfs (modified) (4 diffs)

bootscripts/lfs/init.d/checkfs

@@ -7 +7 @@
 # Authors     : Gerard Beekmans - gerard@linuxfromscratch.org
 #               A. Luebke - luebke@users.sourceforge.net
+#               DJ Lucas - dj@linuxfromscratch.org
 # Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
 #
@@ -38 +39 @@
 ### END INIT INFO
 
-. /lib/boot/functions
+. /lib/lsb/init-functions
 
 case "${1}" in
    start)
       if [ -f /fastboot ]; then
-         boot_mesg -n "/fastboot found, will not perform" ${INFO}
-         boot_mesg " file system checks as requested."
-         echo_ok
+         msg="/fastboot found, will omit "
+         msg="${msg} file system checks as requested.\n"
+         log_info_msg "${msg}"
          exit 0
       fi
 
-      boot_mesg "Mounting root file system in read-only mode..."
+      log_info_msg "Mounting root file system in read-only mode... "
       mount -n -o remount,ro / >/dev/null
-      evaluate_retval
 
       if [ ${?} != 0 ]; then
-         echo_failure
-         boot_mesg -n "FAILURE:\n\nCannot check root" ${FAILURE}
-         boot_mesg -n " filesystem because it could not be mounted"
-         boot_mesg -n " in read-only mode.\n\nAfter you"
-         boot_mesg -n " press Enter, this system will be"
-         boot_mesg -n " halted and powered off."
-         boot_mesg -n "\n\nPress enter to continue..." ${INFO}
-         boot_mesg "" ${NORMAL}
+         log_failure_msg2
+         msg="\n\nCannot check root "
+         msg="${msg}filesystem because it could not be mounted "
+         msg="${msg}in read-only mode.\n\n"
+         msg="${msg}After you press Enter, this system will be "
+         msg="${msg}halted and powered off.\n\n"
+         log_failure_msg "${msg}"
+
+         log_info_msg "Press Enter to continue..." 
          wait_for_user
          /etc/rc.d/init.d/halt stop
+      else
+         log_success_msg2
       fi
 
       if [ -f /forcefsck ]; then
-         boot_mesg -n "/forcefsck found, forcing file" ${INFO}
-         boot_mesg " system checks as requested."
-         echo_ok
+         msg="\n/forcefsck found, forcing file" 
+         msg="${msg} system checks as requested."
+         log_success_msg "$msg"
          options="-f"
       else
@@ -75 +78 @@
       fi
 
-      boot_mesg "Checking file systems..."
-      # Note: -a option used to be -p; but this fails e.g.
-      # on fsck.minix
+      log_info_msg "Checking file systems..."
+      # Note: -a option used to be -p; but this fails e.g. on fsck.minix
       fsck ${options} -a -A -C -T
       error_value=${?}
 
       if [ "${error_value}" = 0 ]; then
-         echo_ok
+         log_success_msg2
       fi
 
       if [ "${error_value}" = 1 ]; then
-         echo_warning
-         boot_mesg -n "WARNING:\n\nFile system errors" ${WARNING}
-         boot_mesg -n " were found and have been corrected. "
-         boot_mesg -n " You may want to double-check that"
-         boot_mesg -n " everything was fixed properly."
-         boot_mesg "" ${NORMAL}
+         msg="\nWARNING:\n\nFile system errors "
+         msg="${msg}were found and have been corrected.\n"
+         msg="${msg}You may want to double-check that "
+         msg="${msg}everything was fixed properly."
+         log_warning_msg "$msg"
       fi
 
       if [ "${error_value}" = 2 -o "${error_value}" = 3 ]; then
-         echo_warning
-         boot_mesg -n "WARNING:\n\nFile system errors" ${WARNING}
-         boot_mesg -n " were found and have been been"
-         boot_mesg -n " corrected, but the nature of the"
-         boot_mesg -n " errors require this system to be"
-         boot_mesg -n " rebooted.\n\nAfter you press enter,"
-         boot_mesg -n " this system will be rebooted"
-         boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
-         boot_mesg "" ${NORMAL}
+         msg="\nWARNING:\n\nFile system errors "
+         msg="${msg}were found and have been been "
+         msg="${msg}corrected, but the nature of the "
+         msg="${msg}errors require this system to be rebooted.\n\n"
+         msg="${msg}After you press enter, "
+         msg="${msg}this system will be rebooted\n\n"
+         log_failure_msg "$msg"
+
+         log_info_msg "Press Enter to continue..." 
          wait_for_user
          reboot -f
@@ -109 +110 @@
 
       if [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
-         echo_failure
-         boot_mesg -n "FAILURE:\n\nFile system errors" ${FAILURE}
-         boot_mesg -n " were encountered that could not be"
-         boot_mesg -n " fixed automatically.  This system"
-         boot_mesg -n " cannot continue to boot and will"
-         boot_mesg -n " therefore be halted until those"
-         boot_mesg -n " errors are fixed manually by a"
-         boot_mesg -n " System Administrator.\n\nAfter you"
-         boot_mesg -n " press Enter, this system will be"
-         boot_mesg -n " halted and powered off."
-         boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
-         boot_mesg "" ${NORMAL}
+         msg="\nFAILURE:\n\nFile system errors "
+         msg="${msg}were encountered that could not be "
+         msg="${msg}fixed automatically.  This system "
+         msg="${msg}cannot continue to boot and will "
+         msg="${msg}therefore be halted until those "
+         msg="${msg}errors are fixed manually by a "
+         msg="${msg}System Administrator.\n\n"
+         msg="${msg}After you press Enter, this system will be "
+         msg="${msg}halted and powered off.\n\n"
+         log_failure_msg "$msg"
+
+         log_info_msg "Press Enter to continue..." 
          wait_for_user
-        /etc/rc.d/init.d/halt stop
+         /etc/rc.d/init.d/halt stop
       fi
 
       if [ "${error_value}" -ge 16 ]; then
-         echo_failure
-         boot_mesg -n "FAILURE:\n\nUnexpected Failure" ${FAILURE}
-         boot_mesg -n " running fsck.  Exited with error"
-         boot_mesg -n " code: ${error_value}."
-         boot_mesg "" ${NORMAL}
+         msg="\nFAILURE:\n\nUnexpected Failure "
+         msg="${msg}running fsck.  Exited with error "
+         msg="${msg} code: ${error_value}."
+         log_failure_msg $msg
          exit ${error_value}
       fi
+
+      exit 0
       ;;
    *)