diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-05-06 13:27:39 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-05-06 13:27:39 -0500 |
| commit | 0c519fbaacd7a7ef816e0250f4ae92fa05227089 (patch) | |
| tree | 38d882e323e5227f12b726b44476b71dff07781a | |
| parent | 86a7354d70cf53fe8f284b9f300507d5f90e298a (diff) | |
| parent | 0ead82c97e51e16ddc7d2eeba6f5dd30aac7466a (diff) | |
| download | vyatta-op-0c519fbaacd7a7ef816e0250f4ae92fa05227089.tar.gz vyatta-op-0c519fbaacd7a7ef816e0250f4ae92fa05227089.zip | |
Merge branch 'napa' of git.vyatta.com:/git/vyatta-op into napa
| -rw-r--r-- | debian/changelog | 19 | ||||
| -rw-r--r-- | scripts/vyatta-clear-conntrack | 8 | ||||
| -rwxr-xr-x | scripts/vyatta-reboot.pl | 17 | ||||
| -rw-r--r-- | templates/shutdown/node.def | 10 |
4 files changed, 43 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 08d391a..0e766fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +vyatta-op (0.13.121) unstable; urgency=low + + * suppress shutdown confirmation query if invoked by rest API. + + -- Michael Larson <mike@vyatta.com> Thu, 05 May 2011 10:34:56 -0700 + +vyatta-op (0.13.120) unstable; urgency=low + + * allow "clear connection-tracking" op mode command to override query + for rest mode. + + -- Michael Larson <mike@vyatta.com> Wed, 04 May 2011 16:10:11 -0700 + +vyatta-op (0.13.119) unstable; urgency=low + + * allow "reboot at" and "reboot" to be invoked by the rest api. + + -- Michael Larson <mike@vyatta.com> Wed, 04 May 2011 14:07:39 -0700 + vyatta-op (0.13.118) unstable; urgency=low * Fail on invalid image name 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`; diff --git a/templates/shutdown/node.def b/templates/shutdown/node.def index 4185f40..81cbc5f 100644 --- a/templates/shutdown/node.def +++ b/templates/shutdown/node.def @@ -1,3 +1,9 @@ help: Shutdown the system -run: ${vyatta_bindir}/yesno -y "Proceed with shutdown? [confirm]" \ - && sudo /sbin/shutdown -h now +run: if [ "$VYATTA_PROCESS_CLIENT" == "gui2_rest" ] + then + sudo /sbin/shutdown -h now + else + ${vyatta_bindir}/yesno -y "Proceed with shutdown? [confirm]" \ + && sudo /sbin/shutdown -h now + fi + |