Changeset 701d877e for bootscripts

Timestamp:

11/28/2011 09:05:32 AM (12 years ago)

Author:

DJ Lucas <dj@…>

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

7505caa

Parents:

d53a9b7

Message:

Revert previous change to init-functions and set defaults for interactive prompt in rc

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

Location:

bootscripts

Files:

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

bootscripts/ChangeLog

@@ -3 +3 @@
    * lfs/init.d/mountfs: Add '-t nosysfs' to umount command
    * lfs/init.d/mountvirtfs: remove unneeded spaces in output
-   * lfs/init.d/rc: Correct double interactive prompt
+   * lfs/init.d/rc: Correct double interactive prompt and set prompt defaults
    * lfs/init.d/setclock: Remove screen output from start case (udev)
    * lfs/init.d/udev{,_retry}:  Restore output to screen and log
-   * lfs/lib/services/init-functions: Restore DISTRO variables
    * lfs/sbin/ifup: Change "..." to ": " (not awaiting additonal output)
 

bootscripts/lfs/init.d/rc

@@ -88 +88 @@
 DISTRO_CONTACT=${DISTRO_CONTACT:-"lfs-dev@linuxfromscratch.org (Registration required)"}
 DISTRO_MINI=${DISTRO_MINI:-"LFS"}
+IPROMPT=${IPROMPT:-"no"}
 
 # These 3 signals will not cause our script to exit
@@ -113 +114 @@
 
 if [ "${IPROMPT}" == "yes" -a "${runlevel}" == "S" ]; then
-   # dcol and icol are spaces before the message to center the
-   # message on screen.
-
+   # The total length of the distro welcome string, without escape codes
+   wlen=${wlen:-$(echo "Welcome to ${DISTRO}" | wc -c )}
+   welcome_message=${welcome_message:-"Welcome to ${INFO}${DISTRO}${NORMAL}"}
+
+   # The total length of the interactive string, without escape codes
+   ilen=${ilen:-$(echo "Press 'I' to enter interactive startup" | wc -c )}
+   i_message=${i_message:-"Press '${FAILURE}I${NORMAL}' to enter interactive startup"}
+
+
+   # dcol and icol are spaces before the message to center the message
+   # on screen. itime is the amount of wait time for the user to press a key
    wcol=$(( ( ${COLUMNS} - ${wlen} ) / 2 ))
    icol=$(( ( ${COLUMNS} - ${ilen} ) / 2 ))
+   itime=${itime:-"3"}
 
    echo -e "\n\n"

bootscripts/lfs/lib/services/init-functions

@@ -62 +62 @@
 BRACKET="\\033[1;34m"        # Brackets are blue
 
-# Distro Information
-DISTRO="Linux From Scratch" # The distro name as displayed
-DISTRO_CONTACT="lfs-dev@linuxfromscratch.org" # Bug report address
-DISTRO_MINI="LFS" # Short name used in filenames for distro config
-
 # Use a colored prefix
 BMPREFIX="     "

bootscripts/lfs/sysconfig/rc.site

@@ -38 +38 @@
 
 # The total length of the distro welcome string, without escape codes
-wlen=$(echo "Welcome to ${DISTRO}" | wc -c )
-welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}"
+#wlen=$(echo "Welcome to ${DISTRO}" | wc -c )
+#welcome_message="Welcome to ${INFO}${DISTRO}${NORMAL}"
 
 # The total length of the interactive string, without escape codes
-ilen=$(echo "Press 'I' to enter interactive startup" | wc -c )
-i_message="Press '${FAILURE}I${NORMAL}' to enter interactive startup"
+#ilen=$(echo "Press 'I' to enter interactive startup" | wc -c )
+#i_message="Press '${FAILURE}I${NORMAL}' to enter interactive startup"
 
 # Set scripts to skip the file system check on reboot