Author: dj
Date: 2009-03-25 00:35:58 -0600 (Wed, 25 Mar 2009)
New Revision: 8849
Modified:
trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/rc
Log:
Corrected several 'echo -e' lines in cleanfs and checkfs.
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog 2009-03-21 09:47:59 UTC
(rev 8848)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog 2009-03-25 06:35:58 UTC
(rev 8849)
@@ -1,4 +1,7 @@
ChangeLog
+20090325 - [dj] * Corrected serveral echo commands missing -e - Thanks to
+ Michael Tremer at IPFire for the corrections.
+
20081023 - [dj] * Removed BROKEN_COMPOSE handling in console script because
kernel patch was accepted upstream.
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs 2009-03-21
09:47:59 UTC (rev 8848)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs 2009-03-25
06:35:58 UTC (rev 8849)
@@ -30,13 +30,13 @@
if [ ${?} != 0 ]
then
log_failure_msg "Mounting root file system in read-only mode"
- echo "${FAILURE}FAILURE:\n"
- echo -n "${FIALURE}Cannot check root filesystem because it "
- echo "${FAILURE}could not be mounted"
- echo "${FAILURE}in read-only mode.\n\n"
- echo -n "${FAILURE}After you press Enter, this system will be "
- echo "${FAILURE}halted and powered off.\n"
- echo "${INFO}Press enter to continue...${NORMAL}"
+ echo -e "${FAILURE}FAILURE:\n"
+ echo -e -n "${FIALURE}Cannot check root filesystem because it "
+ echo -e "${FAILURE}could not be mounted"
+ echo -e "${FAILURE}in read-only mode.\n\n"
+ echo -e -n "${FAILURE}After you press Enter, this system will be "
+ echo -e "${FAILURE}halted and powered off.\n"
+ echo -e "${INFO}Press enter to continue...${NORMAL}"
read ENTER
/etc/rc.d/init.d/halt stop
fi
@@ -61,38 +61,38 @@
elif [ "${error_value}" = 1 ]
then
log_warning_msg "Checking file systems..."
- echo "${WARNING}WARNING:\n"
- echo "${WARNING}File system errors were found and have been"
- echo "${WARNING}corrected. You may want to double-check that"
- echo "${WARNING}everything was fixed properly.${NORMAL}"
+ echo -e "${WARNING}WARNING:\n"
+ echo -e "${WARNING}File system errors were found and have been"
+ echo -e "${WARNING}corrected. You may want to double-check that"
+ echo -e "${WARNING}everything was fixed properly.${NORMAL}"
elif [ "${error_value}" = 2 -o "${error_value}" = 3 ]; then
log_warning_msg "Checking file systems..."
- echo "${WARNING}WARNING:\n"
- echo "${WARNING}File system errors were found and have been been"
- echo "${WARNING}corrected, but the nature of the errors require"
- echo "${WARNING}this system to be rebooted.\n"
- echo "After you press enter, this system will be rebooted.\n"
- echo "${INFO}Press Enter to continue...${NORMAL}"
+ echo -e "${WARNING}WARNING:\n"
+ echo -e "${WARNING}File system errors were found and have been
been"
+ echo -e "${WARNING}corrected, but the nature of the errors require"
+ echo -e "${WARNING}this system to be rebooted.\n"
+ echo -e "After you press enter, this system will be rebooted.\n"
+ echo -e "${INFO}Press Enter to continue...${NORMAL}"
read ENTER
reboot -f
elif [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
log_failure_msg "Checking file systems..."
- echo "${FAILURE}FAILURE:\n"
- echo "${FAILURE}File system errors were encountered that could"
- echo "${FAILURE}not be fixed automatically. This system cannot"
- echo "${FAILURE}continue to boot and will therefore be halted"
- echo "${FAILURE}until those errors are fixed manually by a"
- echo "${FAILURE}System Administrator.\n"
- echo "${FAILURE}After you press Enter, this system will be"
- echo "${FAILURE}halted and powered off.\n"
- echo "${INFO}Press Enter to continue...${NORMAL}"
+ echo -e "${FAILURE}FAILURE:\n"
+ echo -e "${FAILURE}File system errors were encountered that could"
+ echo -e "${FAILURE}not be fixed automatically. This system cannot"
+ echo -e "${FAILURE}continue to boot and will therefore be halted"
+ echo -e "${FAILURE}until those errors are fixed manually by a"
+ echo -e "${FAILURE}System Administrator.\n"
+ echo -e "${FAILURE}After you press Enter, this system will be"
+ echo -e "${FAILURE}halted and powered off.\n"
+ echo -e "${INFO}Press Enter to continue...${NORMAL}"
read ENTER
/etc/rc.d/init.d/halt stop
elif [ "${error_value}" -ge 16 ]; then
log_failure_msg "Checking file systems..."
- echo "${FAILURE}FAILURE:\n"
- echo "${FAILURE}Unexpected Failure running fsck. Exited with
error"
- echo "${FAILURE}code: ${error_value}.${NORMAL}"
+ echo -e "${FAILURE}FAILURE:\n"
+ echo -e "${FAILURE}Unexpected Failure running fsck. Exited with
error"
+ echo -e "${FAILURE}code: ${error_value}.${NORMAL}"
exit ${error_value}
fi
;;
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs 2009-03-21
09:47:59 UTC (rev 8848)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs 2009-03-25
06:35:58 UTC (rev 8849)
@@ -55,13 +55,13 @@
mknod "${name}" p
;;
*)
- echo -n "\n${WARNING}Unknown device type: ${dtype}"
- echo "${NORMAL}"
+ echo -e -n "\n${WARNING}Unknown device type:
${dtype}"
+ echo -e "${NORMAL}"
;;
esac
;;
*)
- echo "\n${WARNING}Unknown type: ${type}${NORMAL}"
+ echo -e "\n${WARNING}Unknown type: ${type}${NORMAL}"
continue
;;
esac
@@ -111,3 +111,4 @@
esac
# End /etc/init.d/cleanfs
+
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/rc
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/rc 2009-03-21 09:47:59 UTC
(rev 8848)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/rc 2009-03-25 06:35:58 UTC
(rev 8849)
@@ -127,7 +127,7 @@
# Start all functions in this runlevel if they weren't started in
# the previous runlevel
-for link in $( ls -v ${RC_BASE}/rc${runlevel}.d/S* 2> /dev/null)
+for link in $(ls -v ${RC_BASE}/rc${runlevel}.d/S* 2> /dev/null)
do
if [ "${prevlevel}" != "N" ]; then
script=${link#$RC_BASE/rc$runlevel.d/S[0-9][0-9]}
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
