- nls fixes

svn-id: @545

diff --git a/rc.d/init.d/shutdwn b/rc.d/init.d/shutdwn
index 356dfb6c04a77421db743f762a25121052a87318..fafa7a206685bfa508273a96eb9fc4afc674ed90 100755 (executable)
--- a/rc.d/init.d/shutdwn
+++ b/rc.d/init.d/shutdwn
@@ -6,7 +6,7 @@
 #               Modified for PLD Linux by Grzegorz Stanislawski
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
 #
-# $Id: shutdwn,v 1.9 1999/09/04 19:49:41 waszi Exp $
+# $Id: shutdwn,v 1.10 1999/09/27 15:12:26 wiget Exp $
 
 # Set the path.
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -51,7 +51,8 @@ if [ -x /sbin/raidstop -a -f /etc/raidtab ]; then
        if [ -f /proc/mdstat ] ; then
                mddevs=$(grep ^md /proc/mdstat | awk '{ print $1 }')
                for mddev in $mddevs ; do
-                       run_cmd "Turning off RAID for $mddev" raidstop /dev/$mddev
+                       MESSAGE="`nls "Turning off RAID for %s" "$mddev"`"
+                       run_cmd "$MESSAGE" raidstop /dev/$mddev
                done
                unset mddev mddevs
        fi

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 0f553b024202cf51fb516fc8538170cb73da58da..e4408f09cc3bcbc98232e86f8e790bd1768f614a 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.27 1999/09/27 14:23:04 wiget Exp $
+# $Id: rc.sysinit,v 1.28 1999/09/27 15:12:26 wiget Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:      Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -93,9 +93,7 @@ if [ ! -f /fastboot ] && [ ! -n "$NFSROOT" ]; then
 
        # A return of 2 or higher means there were serious problems.
        if [ $rc -gt 1 ]; then
-               nls "\n\n*** An error occurred during the file system check.\n"
-               nls "*** Dropping you to a shell; the system will reboot\n"
-               nls "*** when you leave the shell.\n"
+               nls "\n\n*** An error occurred during the file system check.\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
 
                PS1="`nls "(Repair filesystem) #"`"; export PS1
                if [ "$RUN_SULOGIN_ON_ERR" == "yes" ]; then
@@ -214,11 +212,7 @@ if [ -f /proc/mdstat -a -f /etc/raidtab -a -x /sbin/raidadd ]; then
 
        # A non-zero return means there were problems.
        if [ $rc -gt 0 ]; then
-               echo
-               echo
-               nls "*** An error occurred during the RAID startup"
-               nls "*** Dropping you to a shell; the system will reboot"
-               nls "*** when you leave the shell."
+               nls "\n\n*** An error occurred during the RAID startup\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
 
                PS1="`nls "(RAID Repair) #"`"; export PS1
                if [ "$RUN_SULOGIN_ON_ERR" == "yes" ]; then
@@ -242,11 +236,7 @@ if [ ! -f /fastboot ]; then
 
        # A return of 2 or higher means there were serious problems.
        if [ $rc -gt 1 ]; then
-               echo
-               echo
-               nls "*** An error occurred during the file system check."
-               nls "*** Dropping you to a shell; the system will reboot"
-               nls "*** when you leave the shell."
+               nls "\n\n*** An error occurred during the file system check.\n*** Dropping you to a shell; the system will reboot\n*** when you leave the shell.\n"
 
                PS1="`nls "(Repair filesystem) #"`"; export PS1
                if [ "$RUN_SULOGIN_ON_ERR" == "yes" ]; then