[Lunar-commits] r14844 - brutus/trunk/moe

[Jaime Buffery]

Author: nestu
Date: 2005-05-19 20:15:27 +0000 (Thu, 19 May 2005)
New Revision: 14844

Modified:
   brutus/trunk/moe/mount
Log:
Some cleaning up in the messages echoed, and a couple of typos

Modified: brutus/trunk/moe/mount
===================================================================
--- brutus/trunk/moe/mount	2005-05-19 20:02:31 UTC (rev 14843)
+++ brutus/trunk/moe/mount	2005-05-19 20:15:27 UTC (rev 14844)
@@ -302,7 +302,7 @@
    # write wtmp in /var before umounting /var
    run_without_msg "reboot -w"
     
-   echo "Umounting all filesystems:"
+   echo "Unmounting all filesystems :"
     
    cat ${MOUNTS} | tac | while read TYPE PNT FS REST
    do
@@ -323,7 +323,7 @@
       run_without_msg "sync ; sync" # Flush buffers
 	    
       if [ "${TYPE}" == "/dev/loop*" ] && [ -f ${PNT} ] ; then      
-         run_with_msg " * Deataching loopback device ${PNT}:" "losetup -d ${PNT}"
+         run_with_msg " * Detaching loopback device ${PNT} : " "losetup -d ${PNT}"
          continue                                   
       fi
 	    
@@ -350,7 +350,7 @@
              sleep 1  
              run_without_msg "fuser -s -km -9 ${PNT}" "1"
              run_without_msg "umount -lf ${PNT}"    "4"
-             run without_message "sync; sync"
+             run_without_msg "sync; sync"
              ;;
            5)
              UNMOUNT_ERROR=1 # warn that it hasn't been able to unmount the easy way
@@ -362,19 +362,19 @@
 
       if [ ${UNMOUNT_ERROR} -eq 1 ]; then # haven't been able to unmount the point, so be drastic
          echo -e ${RESULT_WARN}
-         run_with_msg "  * Attempting to remount read only: $PNT" "mount -o remount,ro ${PNT}"
+         run_with_msg "  * Attempting to remount ${PNT} read-only : " "mount -o remount,ro ${PNT}"
       else
          echo -e ${RESULT_OK}       
       fi
 
    done
     
-   run_with_msg " * Deactivating swap space:" "swapoff  -a"
+   run_with_msg " * Deactivating swap space : " "swapoff  -a"
     
    run_without_msg "sync; sync"
     
-   if ! run_with_msg  " * Remounting root readonly"  "mount -no remount,ro /" ; then
-      if ! run_with_msg  " * Trying again to remount root readonly"  "umount -L -O remount,ro /" "4" ; then
+   if ! run_with_msg  " * Remounting root readonly : "  "mount -no remount,ro /" ; then
+      if ! run_with_msg  " * Trying again to remount root readonly : "  "umount -L -O remount,ro /" "4" ; then
          read   -n 1  -t 30  -p  "Do you want to login? (y/n) "  CONFIRM
          echo   ""
          case ${CONFIRM} in