summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Harpin <development@landsofshadow.co.uk>2015-01-24 20:43:23 +0000
committerAlex Harpin <development@landsofshadow.co.uk>2015-01-24 20:43:23 +0000
commite203db221505845849920557b85ce7d76ad6b5db (patch)
treead74460212844320f776b3bf3d18e67960410779
parentc2ca8e98c46975a7aa33cf0f07ae55a878c393ad (diff)
downloadvyatta-op-e203db221505845849920557b85ce7d76ad6b5db.tar.gz
vyatta-op-e203db221505845849920557b85ce7d76ad6b5db.zip
vyatta-op: replace 'show shutdown' with 'show poweroff' and use script
Rename 'show shutdown' to 'show poweroff' so it is the same as the configuration options, and set the command to use the script to show the scheduled poweroff time. Bug #461 http://bugzilla.vyos.net/show_bug.cgi?id=461
-rw-r--r--templates/show/poweroff/node.def2
-rw-r--r--templates/show/shutdown/node.def8
2 files changed, 2 insertions, 8 deletions
diff --git a/templates/show/poweroff/node.def b/templates/show/poweroff/node.def
new file mode 100644
index 0000000..a65f4e6
--- /dev/null
+++ b/templates/show/poweroff/node.def
@@ -0,0 +1,2 @@
+help: Show scheduled poweroff
+run: sudo /opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action show_poweroff
diff --git a/templates/show/shutdown/node.def b/templates/show/shutdown/node.def
deleted file mode 100644
index 52bd3a4..0000000
--- a/templates/show/shutdown/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Show scheduled shutdown
-run: if [ -f /var/run/shutdown.pid ]
- then if [ -r /tmp/shutdown.at ]
- then echo -n "Shutdown pending at "; cat /tmp/shutdown.at
- else echo "Shutdown pending"
- fi
- else echo "No shutdown pending"
- fi