Corrected several 'echo -e' lines in cleanfs and checkfs.

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

4 files changed, 37 insertions, 33 deletions

diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog
index ba86819ef..6230e4bbf 100644
--- a/bootscripts/contrib/lsb-v3/ChangeLog
+++ b/bootscripts/contrib/lsb-v3/ChangeLog
@@ -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.
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/checkfs b/bootscripts/contrib/lsb-v3/init.d/checkfs
index a7f125708..821dd2b2c 100644
--- a/bootscripts/contrib/lsb-v3/init.d/checkfs
+++ b/bootscripts/contrib/lsb-v3/init.d/checkfs
@@ -30,13 +30,13 @@ case "${1}" in
         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 @@ case "${1}" in
         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
         ;;
diff --git a/bootscripts/contrib/lsb-v3/init.d/cleanfs b/bootscripts/contrib/lsb-v3/init.d/cleanfs
index b702eefbd..23fa9b1a3 100644
--- a/bootscripts/contrib/lsb-v3/init.d/cleanfs
+++ b/bootscripts/contrib/lsb-v3/init.d/cleanfs
@@ -55,13 +55,13 @@ create_files()
                             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 @@ case "${1}" in
 esac
 
 # End /etc/init.d/cleanfs
+
diff --git a/bootscripts/contrib/lsb-v3/init.d/rc b/bootscripts/contrib/lsb-v3/init.d/rc
index f3108d03d..23fb97fe2 100644
--- a/bootscripts/contrib/lsb-v3/init.d/rc
+++ b/bootscripts/contrib/lsb-v3/init.d/rc
@@ -127,7 +127,7 @@ fi
 
 # 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]}