]> git.pld-linux.org Git - projects/rc-scripts.git/commitdiff
- corrected order of conditions
authorJan Rękorajski <baggins@pld-linux.org>
Sun, 30 Oct 2005 00:03:21 +0000 (00:03 +0000)
committerJan Rękorajski <baggins@pld-linux.org>
Sun, 30 Oct 2005 00:03:21 +0000 (00:03 +0000)
svn-id: @6503

rc.d/rc

diff --git a/rc.d/rc b/rc.d/rc
index ab5742990205c3a235ac363011fd3813bcaad432..cff8fc94c77046615049d3366b4f3665cf66395c 100755 (executable)
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -98,8 +98,8 @@ fi
 
 # See if we want to be in user confirmation mode
 if [ "$previous" = "N" ]; then
-       if grep -qi confirm /proc/cmdline >/dev/null 2>/dev/null \
-               || [ -f /var/run/confirm ] || ! is_yes "$VSERVER"; then
+       if ! is_yes "$VSERVER" && grep -qi confirm /proc/cmdline >/dev/null 2>/dev/null \
+               || [ -f /var/run/confirm ]; then
                rm -f /var/run/confirm
                CONFIRM="yes"
                nls "Entering interactive startup"
This page took 0.043928 seconds and 4 git commands to generate.