- fixed problem with Runlevel messages and INIT_COL variable

svn-id: @695

diff --git a/po/pl.po b/po/pl.po
index 88339b4fcc8e914108a403ae560663012fa2c5e7..5583017bad9a0775c7577af50b9d9d37143869c5 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # Polish translation of rc-scripts.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Arkadiusz Miskiewicz <misiek@pld.org.pl>, 1999.
-# $Id: pl.po,v 1.24 2000/03/22 21:30:31 wiget Exp $
+# $Id: pl.po,v 1.25 2000/03/24 08:48:54 misiek Exp $
 #
 msgid ""
 msgstr ""
@@ -51,8 +51,8 @@ msgid "Setting time zone information ($TIME_ZONE)"
 msgstr "Ustawianie informacji o strefi czasowej ($TIME_ZONE)"
 
 #: ../rc.d/rc:179
-msgid "%sResource Manager: %sRunlevel has been reached%s"
-msgstr "%sZarzadca zasobow: %sZostal osiagniety poziom%s"
+msgid "%sResource Manager: %sRunlevel has been reached"
+msgstr "%sZarzadca zasobow: %sZostal osiagniety poziom"
 
 #: ../rc.d/rc.sysinit:65
 msgid "Starting Device Filesystem Daemon"
@@ -237,7 +237,7 @@ msgstr "Zamykanie systemu w toku \n"
 
 #: ../rc.d/rc:92
 msgid "%sResource Manager: %sEntering runlevel number%s"
-msgstr "%sZarzadca zasobow: %sWejscie na poziom%s"
+msgstr "%sZarzadca zasobow: %sWejscie na poziom"
 
 #: ../rc.d/init.d/functions:357
 msgid "%s dead but pid file exists\n"

diff --git a/rc.d/rc b/rc.d/rc
index c8b971c70591f87d63d964e97b6f54532d2a2509..e0da932a826802616db34e43b7e5dc02b9a264c3 100755 (executable)
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -5,7 +5,7 @@
 #               responsible for the very first setup of basic
 #               things, such as setting the hostname.
 #
-# $Id: rc,v 1.17 2000/03/08 16:29:09 misiek Exp $
+# $Id: rc,v 1.18 2000/03/24 08:48:55 misiek Exp $
 #
 # Original Author:       
 #               Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
@@ -89,10 +89,11 @@ stty onlcr -ixon 0>&1
 # Say something ;)
 af2="`termput setaf 2`"
 af7="`termput setaf 7`"
-line="............................................................................"
-text="`nls "%sResource Manager: %sEntering runlevel number%s" $af2 $af7 $line`"
-unset af2 af7 line
-awk "BEGIN {printf \"%.78s\", \"$text\";}"
+text="`nls "%sResource Manager: %sEntering runlevel number" $af2 $af7`"
+text_size="`nls "%sResource Manager: %sEntering runlevel number" 0 0`"
+unset af2 af7
+echo -n "$text"
+awk "BEGIN { for (j=length(\"$text_size\")-9; j<$INIT_COL; j++) printf \".\" }"
 echo "`termput setaf 6`[`termput setaf 2` $runlevel `termput setaf 6`]`termput setaf 7`"
 
 # Is there an rc directory for this new runlevel?
@@ -166,7 +167,7 @@ if [ "$runlevel" = "0" ] || [ "$runlevel" = "6" ]; then
                eval reboot -d
        fi
 else
-       if [ "$RUN_LDCONFIG" = "yes" ] ; then
+       if [ "$RUN_LDCONFIG" = "yes" -o ! -f /etc/ld.so.cache ] ; then
                if [ -x /sbin/ldconfig ]; then
                        run_cmd "Setting up /etc/ld.so.cache" /sbin/ldconfig -X
                fi
@@ -176,9 +177,10 @@ fi
 # Say something ;)
 af2="`termput setaf 2`"
 af7="`termput setaf 7`"
-line="............................................................................"
-text="`nls "%sResource Manager: %sRunlevel has been reached%s" $af2 $af7 $line`"
-unset af2 af7 line
-awk "BEGIN {printf \"%.78s\", \"$text\";}"
+text="`nls "%sResource Manager: %sRunlevel has been reached" $af2 $af7`"
+text_size="`nls "%sResource Manager: %sRunlevel has been reached" 0 0`"
+unset af2 af7
+echo -n "$text"
+awk "BEGIN { for (j=length(\"$text_size\")-9; j<$INIT_COL; j++) printf \".\" }"
 echo "`termput setaf 6`[`termput setaf 2` $runlevel `termput setaf 6`]`termput setaf 7`"