rc-scripts/trunk/rc.d/rc

[baggins]

Author: baggins
Date: Sun Oct 30 02:03:21 2005
New Revision: 6503

Modified:
   rc-scripts/trunk/rc.d/rc
Log:
- corrected order of conditions


Modified: rc-scripts/trunk/rc.d/rc
==============================================================================
--- rc-scripts/trunk/rc.d/rc	(original)
+++ rc-scripts/trunk/rc.d/rc	Sun Oct 30 02:03:21 2005
@@ -98,8 +98,8 @@
 
 # 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"