diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
| commit | 997291b8a6a66953c6a6270c2dda323769452581 (patch) | |
| tree | da24c0099caede14445289dca8d76560c08de1d9 /templates/reboot | |
| parent | 3610a467094e80a39b6627f6b7655430917b9bd3 (diff) | |
| parent | add153b13de56f97624b2dc433fdbe21b36dbeed (diff) | |
| download | vyatta-op-lithium.tar.gz vyatta-op-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
Makefile.am
debian/changelog
templates/restart/dns/forwarding/node.def
templates/show/version/added/node.def
templates/show/version/all/node.def
templates/show/version/deleted/node.def
templates/show/version/downgraded/node.def
templates/show/version/node.def
templates/show/version/upgraded/node.def
Diffstat (limited to 'templates/reboot')
| -rw-r--r-- | templates/reboot/at/node.def | 1 | ||||
| -rw-r--r-- | templates/reboot/at/node.tag/node.def | 3 | ||||
| -rw-r--r-- | templates/reboot/cancel/node.def | 2 | ||||
| -rw-r--r-- | templates/reboot/node.def | 2 | ||||
| -rw-r--r-- | templates/reboot/now/node.def | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/templates/reboot/at/node.def b/templates/reboot/at/node.def deleted file mode 100644 index 9944ff7..0000000 --- a/templates/reboot/at/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Reboot at a specific time diff --git a/templates/reboot/at/node.tag/node.def b/templates/reboot/at/node.tag/node.def deleted file mode 100644 index 62f39f9..0000000 --- a/templates/reboot/at/node.tag/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Reboot the system at a future time -allowed: echo -n '<HH:MM>' '<MMDDYY>' '<midnight>' '<noon>' -run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_at --at_time "$3" diff --git a/templates/reboot/cancel/node.def b/templates/reboot/cancel/node.def deleted file mode 100644 index 110f595..0000000 --- a/templates/reboot/cancel/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Cancel a pending reboot -run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_cancel diff --git a/templates/reboot/node.def b/templates/reboot/node.def deleted file mode 100644 index e65917d..0000000 --- a/templates/reboot/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Reboot the system -run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot diff --git a/templates/reboot/now/node.def b/templates/reboot/now/node.def deleted file mode 100644 index 2171b45..0000000 --- a/templates/reboot/now/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Reboot the system without confirmation -run: sudo /opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot --now |