From fb100420fd6d54d5e86bf090f1123636cd2dc4e6 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Fri, 14 Oct 2011 11:45:17 -0500
Subject: Bugfix 7557: Move shutdown to poweroff, change confirmation from
 default in the affirmative to defualt in the negative. (cherry picked from
 commit 54c32901389933b1830404f173b338f885add043)

---
 scripts/yesno                           | 3 +++
 templates/poweroff/at/node.def          | 1 +
 templates/poweroff/at/node.tag/node.def | 6 ++++++
 templates/poweroff/cancel/node.def      | 2 ++
 templates/poweroff/node.def             | 9 +++++++++
 templates/poweroff/now/node.def         | 3 +++
 templates/shutdown/at/node.def          | 1 -
 templates/shutdown/at/node.tag/node.def | 6 ------
 templates/shutdown/cancel/node.def      | 2 --
 templates/shutdown/node.def             | 9 ---------
 10 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 templates/poweroff/at/node.def
 create mode 100644 templates/poweroff/at/node.tag/node.def
 create mode 100644 templates/poweroff/cancel/node.def
 create mode 100644 templates/poweroff/node.def
 create mode 100644 templates/poweroff/now/node.def
 delete mode 100644 templates/shutdown/at/node.def
 delete mode 100644 templates/shutdown/at/node.tag/node.def
 delete mode 100644 templates/shutdown/cancel/node.def
 delete mode 100644 templates/shutdown/node.def

diff --git a/scripts/yesno b/scripts/yesno
index 3e10e09..260a23c 100755
--- a/scripts/yesno
+++ b/scripts/yesno
@@ -4,8 +4,11 @@
 default=
 if [ "$1" = "-y" ]
 then default='y'; shift
+elif [[ "$1" = "-n" ]]; then
+  default='n'; shift
 fi
 
+
 if [ $# -eq 0 ]
 then prompt="yes or no: "
 else prompt="$*"
diff --git a/templates/poweroff/at/node.def b/templates/poweroff/at/node.def
new file mode 100644
index 0000000..537bfff
--- /dev/null
+++ b/templates/poweroff/at/node.def
@@ -0,0 +1 @@
+help: Poweroff at a specific time
diff --git a/templates/poweroff/at/node.tag/node.def b/templates/poweroff/at/node.tag/node.def
new file mode 100644
index 0000000..ccc3b5b
--- /dev/null
+++ b/templates/poweroff/at/node.tag/node.def
@@ -0,0 +1,6 @@
+help: Poweroff the system at a future time
+allowed: echo -n '<HH:MM>' '<MMDDYY>' '+MM'
+run: if /opt/vyatta/bin/vyatta-gettime.pl $3 >/tmp/shutdown.at
+     then (sudo /sbin/shutdown -h $3 &
+           disown %?sudo ) >/dev/null 2>&1
+     fi
diff --git a/templates/poweroff/cancel/node.def b/templates/poweroff/cancel/node.def
new file mode 100644
index 0000000..c08a72d
--- /dev/null
+++ b/templates/poweroff/cancel/node.def
@@ -0,0 +1,2 @@
+help: Cancel a pending poweroff
+run: sudo /sbin/shutdown -c
diff --git a/templates/poweroff/node.def b/templates/poweroff/node.def
new file mode 100644
index 0000000..b3a41f1
--- /dev/null
+++ b/templates/poweroff/node.def
@@ -0,0 +1,9 @@
+help: Poweroff the system
+run: if [ "$VYATTA_PROCESS_CLIENT" == "gui2_rest" ]
+     then
+        sudo /sbin/shutdown -h now
+     else 
+        ${vyatta_bindir}/yesno -n "Proceed with poweroff? (Yes/No) [No] " \
+        && sudo /sbin/shutdown -h now
+     fi
+
diff --git a/templates/poweroff/now/node.def b/templates/poweroff/now/node.def
new file mode 100644
index 0000000..1117668
--- /dev/null
+++ b/templates/poweroff/now/node.def
@@ -0,0 +1,3 @@
+help: Poweroff the system now [disruptive]
+run:  sudo /sbin/shutdown -h now
+
diff --git a/templates/shutdown/at/node.def b/templates/shutdown/at/node.def
deleted file mode 100644
index baa0023..0000000
--- a/templates/shutdown/at/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Shutdown at a specific time
diff --git a/templates/shutdown/at/node.tag/node.def b/templates/shutdown/at/node.tag/node.def
deleted file mode 100644
index 3360f88..0000000
--- a/templates/shutdown/at/node.tag/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Shutdown the system at a future time
-allowed: echo -n '<HH:MM>' '<MMDDYY>' '+MM'
-run: if /opt/vyatta/bin/vyatta-gettime.pl $3 >/tmp/shutdown.at
-     then (sudo /sbin/shutdown -h $3 &
-           disown %?sudo ) >/dev/null 2>&1
-     fi
diff --git a/templates/shutdown/cancel/node.def b/templates/shutdown/cancel/node.def
deleted file mode 100644
index 3095c66..0000000
--- a/templates/shutdown/cancel/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Cancel a pending shutdown
-run: sudo /sbin/shutdown -c
diff --git a/templates/shutdown/node.def b/templates/shutdown/node.def
deleted file mode 100644
index 81cbc5f..0000000
--- a/templates/shutdown/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Shutdown the system
-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
-
-- 
cgit v1.2.3