gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various cosmetic fixes for bootscripts

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9673 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
DJ Lucas 2011-11-28 08:13:36 +00:00
parent 17698aac3c
commit 642e2e9f3f
9 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootscripts/ChangeLog
View File

@ -1,3 +1,13 @@
2011-11-28 DJ Lucas <dj@linuxfromscratch.org>
* 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/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)
2011-11-14 Bruce Dubbs <bdubbs@linuxfromscratch.org> 2011-11-14 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* The following are from suggestions by DJ Lucas * The following are from suggestions by DJ Lucas

2
bootscripts/lfs/init.d/mountfs
View File

@ -61,7 +61,7 @@ case "${1}" in
stop) stop)
# Don't unmount tmpfs like /run # Don't unmount tmpfs like /run
log_info_msg "Unmounting all other currently mounted file systems..." log_info_msg "Unmounting all other currently mounted file systems..."
umount -a -d -r -t notmpfs >/dev/null umount -a -d -r -t notmpfs,nosysfs >/dev/null
evaluate_retval evaluate_retval
exit 0 exit 0
;; ;;

2
bootscripts/lfs/init.d/mountvirtfs
View File

@ -36,7 +36,7 @@ case "${1}" in
mount -n /run || failed=1 mount -n /run || failed=1
mkdir -p /run/{var,lock,shm} mkdir -p /run/{var,lock,shm}
log_info_msg "Mounting virtual file systems: ${INFO}/run" log_info_msg "Mounting virtual file systems: ${INFO}/run"
if ! mountpoint /proc >/dev/null; then if ! mountpoint /proc >/dev/null; then
log_info_msg2 " ${INFO}/proc" log_info_msg2 " ${INFO}/proc"

2
bootscripts/lfs/init.d/rc
View File

@ -111,7 +111,7 @@ if [ "$runlevel" == "6" -o "$runlevel" == "0" ]; then IPROMPT="no"; fi
# Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7 # Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7
if [ "$runlevel" == "S" ]; then dmesg -n "${LOGLEVEL:-7}"; fi if [ "$runlevel" == "S" ]; then dmesg -n "${LOGLEVEL:-7}"; fi
if [ "${IPROMPT}" == "yes" ]; then if [ "${IPROMPT}" == "yes" -a "${runlevel}" == "S" ]; then
# dcol and icol are spaces before the message to center the # dcol and icol are spaces before the message to center the
# message on screen. # message on screen.

3
bootscripts/lfs/init.d/setclock
View File

@ -44,10 +44,7 @@ esac
case ${1} in case ${1} in
start) start)
log_info_msg2 "\n" # Run by udev, make sure start on new line
log_info_msg "Setting system clock..."
hwclock --hctosys ${CLOCKPARAMS} >/dev/null hwclock --hctosys ${CLOCKPARAMS} >/dev/null
evaluate_retval
;; ;;
stop) stop)

2
bootscripts/lfs/init.d/udev
View File

@ -84,7 +84,7 @@ case "${1}" in
# Now wait for udevd to process the uevents we triggered # Now wait for udevd to process the uevents we triggered
/sbin/udevadm settle /sbin/udevadm settle
#log_success_msg2 log_success_msg2
;; ;;
*) *)

2
bootscripts/lfs/init.d/udev_retry
View File

@ -56,7 +56,7 @@ case "${1}" in
# Now wait for udevd to process the uevents we triggered # Now wait for udevd to process the uevents we triggered
/sbin/udevadm settle /sbin/udevadm settle
#evaluate_retval evaluate_retval
;; ;;
*) *)

5
bootscripts/lfs/lib/services/init-functions
View File

@ -61,6 +61,11 @@ FAILURE="\\033[1;31m" # Failures are red
INFO="\\033[1;36m" # Information is light cyan INFO="\\033[1;36m" # Information is light cyan
BRACKET="\\033[1;34m" # Brackets are blue 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 # Use a colored prefix
BMPREFIX=" " BMPREFIX=" "
SUCCESS_PREFIX="${SUCCESS} * ${NORMAL}" SUCCESS_PREFIX="${SUCCESS} * ${NORMAL}"

2
bootscripts/lfs/sbin/ifup
View File

@ -55,7 +55,7 @@ file=/etc/sysconfig/ifconfig.${1}
. /lib/lsb/init-functions . /lib/lsb/init-functions
log_info_msg "Bringing up the ${1} interface... " log_info_msg "Bringing up the ${1} interface: "
if [ ! -r "${file}" ]; then if [ ! -r "${file}" ]; then
log_warning_msg "\n${file} is missing or cannot be accessed." log_warning_msg "\n${file} is missing or cannot be accessed."