X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rc.d%2Frc;fp=rc.d%2Frc;h=4bf8cb2ad1b84e5044d399c907426639b43d2435;hb=4404a269deb7ef3202edfe76ce89af0fb81c5bf2;hp=04d6f383747528a4120f227cc023abef6e92b368;hpb=709875e895a085534cc77a44524c0a7ee2b9c7f8;p=rc-scripts.git diff --git a/rc.d/rc b/rc.d/rc index 04d6f38..4bf8cb2 100755 --- 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 - 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 @@ -82,7 +82,7 @@ fi # 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" @@ -129,14 +129,6 @@ else 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