- version 0.5.4

[rc-scripts.git] / rc.d / rc

diff --git a/rc.d/rc b/rc.d/rc
index eba065216057ae8b472ed76d3b6dd01f5e2493a5..4bf8cb2ad1b84e5044d399c907426639b43d2435 100755 (executable)
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -68,7 +68,7 @@ fi
 # virtual console, and send messages to /dev/console
 # (it can be serial console too)
 if [ "$COLUMNS" -gt 0 ]; then
 # virtual console, and send messages to /dev/console
 # (it can be serial console too)
 if [ "$COLUMNS" -gt 0 ]; then

-       if [ "$argv2" != "chroot" ] && ! is_yes "$VSERVER" && \
+       if [ "$argv2" != "chroot" ] && \

                [ "$runlevel" = "0" -o "$runlevel" = "6" ]; then
                CONSOLE=/dev/tty1
                [ -x /usr/bin/chvt ] && /usr/bin/chvt 1 && echo > $CONSOLE
                [ "$runlevel" = "0" -o "$runlevel" = "6" ]; then
                CONSOLE=/dev/tty1
                [ -x /usr/bin/chvt ] && /usr/bin/chvt 1 && echo > $CONSOLE


@@ -82,7 +82,7 @@ fi
 
 # See if we want to be in user confirmation mode
 if [ "$previous" = "N" ]; then
 
 # See if we want to be in user confirmation mode
 if [ "$previous" = "N" ]; then

-       if ! is_yes "$VSERVER" && grep -qi confirm /proc/cmdline >/dev/null 2>/dev/null \
+       if grep -qi confirm /proc/cmdline >/dev/null 2>/dev/null \

                || [ -f /var/run/confirm ]; then
                rm -f /var/run/confirm
                CONFIRM="yes"
                || [ -f /var/run/confirm ]; then
                rm -f /var/run/confirm
                CONFIRM="yes"


@@ -129,14 +129,6 @@ else
        export progress=0
 fi
 
        export progress=0
 fi
 

-if is_yes "$VSERVER"; then
-       # if runlevel is not 0 (halt) or 6 (reboot) run rc.sysinit
-       # BUT only if rc is run standalone (not run by init, as init will run rc.sysinit)
-       if [ "$previous" != "N" -a "$runlevel" != "0" -a "$runlevel" != "6" ]; then
-               /etc/rc.d/rc.sysinit $runlevel
-       fi
-fi
-

 # set onlcr to avoid staircase effect and do not lock scrolling
 stty onlcr -ixon 0>&1 2>/dev/null
 
 # set onlcr to avoid staircase effect and do not lock scrolling
 stty onlcr -ixon 0>&1 2>/dev/null
 


@@ -147,14 +139,15 @@ af7=$(termput op)
 text="$(termput op)$(nls '%sResource Manager: %sEntering runlevel number' "$af2" "$af7")"
 text_size="$(nls '%sResource Manager: %sEntering runlevel number' "" "")"
 resp_size="$(nls 'DONE')"
 text="$(termput op)$(nls '%sResource Manager: %sEntering runlevel number' "$af2" "$af7")"
 text_size="$(nls '%sResource Manager: %sEntering runlevel number' "" "")"
 resp_size="$(nls 'DONE')"

-{
-       local _len=${#text_size}
-       local _last_col=$(($INIT_COL+${#resp_size}-${#runlevel}))
-       while [ $((_len++)) -lt $_last_col ]; do
-               text="$text."
-       done
-       echo -n "$text"
-}
+
+_len=${#text_size}
+_last_col=$(($INIT_COL+${#resp_size}-${#runlevel}))
+while [ $((_len++)) -lt $_last_col ]; do
+       text="$text."
+done
+echo -n "$text"
+unset _len _last_col
+

 echo "${af6}[${af2} $runlevel ${af6}]${af7}"
 
 # Is there an rc directory for this new runlevel?
 echo "${af6}[${af2} $runlevel ${af6}]${af7}"
 
 # Is there an rc directory for this new runlevel?