Merge branch 'napa' of git.vyatta.com:/git/vyatta-op into napa

2 files changed, 16 insertions, 9 deletions

diff --git a/scripts/vyatta-clear-conntrack b/scripts/vyatta-clear-conntrack
index 99874a3..0979e4a 100644
--- a/scripts/vyatta-clear-conntrack
+++ b/scripts/vyatta-clear-conntrack
@@ -55,8 +55,12 @@ get_response () {
 response=''
 while [ -z "$response" ]
 do
-  echo -ne "\nThis will clear all currently tracked and expected connections. Continue? (Y/N) [N]: "
-  response=$(get_response "N" "Y N")
+  if [ "$VYATTA_PROCESS_CLIENT" == "gui2_rest" ]; then
+      response="y"
+  else
+      echo -ne "\nThis will clear all currently tracked and expected connections. Continue? (Y/N) [N]: "
+      response=$(get_response "N" "Y N")
+  fi
   if [ "$response" == "n" ]; then
     exit 1
   else
diff --git a/scripts/vyatta-reboot.pl b/scripts/vyatta-reboot.pl
index 4d34fee..eaef885 100755
--- a/scripts/vyatta-reboot.pl
+++ b/scripts/vyatta-reboot.pl
@@ -115,11 +115,12 @@ if ($action eq "reboot") {
     if (defined $now) {
         do_reboot($login);
     } else {
-        if (prompt("Proceed with reboot? [confirm]", -y1d=>"y")) {
+        if (defined($ENV{VYATTA_PROCESS_CLIENT} && $ENV{VYATTA_PROCESS_CLIENT} eq 'gui2_rest') || 
+	    prompt("Proceed with reboot? [confirm]", -y1d=>"y")) {
             do_reboot($login);
-        } else {
-            print "Reboot canceled\n";
-            exit 1;
+	} else {
+	    print "Reboot canceled\n";
+	    exit 1;
         }
     }
 }
@@ -155,9 +156,11 @@ if ($action eq "reboot_at") {
     system("atrm $job");
 
     print "\nReload scheduled for $time\n\n";
-    if (! prompt("Proceed with reboot schedule? [confirm]", -y1d=>"y")) {
-	print "Reboot canceled\n";
-	exit 1;
+    if (!defined($ENV{VYATTA_PROCESS_CLIENT}) || $ENV{VYATTA_PROCESS_CLIENT} ne 'gui2_rest') {
+	if (! prompt("Proceed with reboot schedule? [confirm]", -y1d=>"y")) {
+	    print "Reboot canceled\n";
+	    exit 1;
+	}
     }
 
     @lines = `echo sudo /sbin/reboot | at $at_time 2>&1`;