diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-12 10:39:13 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-12 10:39:13 -0700 |
| commit | 89328f4f289adfe2cdc669c9ff3ea04ac19971b6 (patch) | |
| tree | d8fe40be5bb417ab2d2cbb1c8d07ce3ecb117ea1 | |
| parent | fa8c23dfb664eff08118179b1428f0acfd452d8d (diff) | |
| parent | 2b7a2596d1eca1248a1f851ed933d7ac9c3c0902 (diff) | |
| download | vyatta-op-89328f4f289adfe2cdc669c9ff3ea04ac19971b6.tar.gz vyatta-op-89328f4f289adfe2cdc669c9ff3ea04ac19971b6.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-op into jenner
| -rw-r--r-- | templates/show/shutdown/node.def | 2 | ||||
| -rw-r--r-- | templates/shutdown/at/node.tag/node.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/show/shutdown/node.def b/templates/show/shutdown/node.def index ecc8c4b..52bd3a4 100644 --- a/templates/show/shutdown/node.def +++ b/templates/show/shutdown/node.def @@ -1,7 +1,7 @@ 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 + then echo -n "Shutdown pending at "; cat /tmp/shutdown.at else echo "Shutdown pending" fi else echo "No shutdown pending" diff --git a/templates/shutdown/at/node.tag/node.def b/templates/shutdown/at/node.tag/node.def index 94cd332..8760fea 100644 --- a/templates/shutdown/at/node.tag/node.def +++ b/templates/shutdown/at/node.tag/node.def @@ -1,5 +1,5 @@ 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 & + then nohup sudo /sbin/shutdown -h $3 </dev/null >/dev/null 2>&1 fi |