diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-08-17 15:52:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 15:52:32 +0200 |
| commit | f6836850812eb7826c40c866eb61a03e36f431ab (patch) | |
| tree | 3373698e2dba150f2f7b305cb1512fa8c045d6c1 /op-mode-definitions | |
| parent | bb1f7d0cfd6b7ba96eb049e47e857fb92f6c09e5 (diff) | |
| parent | 86088fa6e0816cb7e79ce497a89df2d004bc4764 (diff) | |
| download | vyos-1x-f6836850812eb7826c40c866eb61a03e36f431ab.tar.gz vyos-1x-f6836850812eb7826c40c866eb61a03e36f431ab.zip | |
Merge pull request #29 from runborg/current
T689: Rewritten poweroff/reboot script to use systemd-shutdownd service
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/poweroff.xml | 38 | ||||
| -rw-r--r-- | op-mode-definitions/reboot.xml | 38 |
2 files changed, 56 insertions, 20 deletions
diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml index 07cea7927..ff27f4f4d 100644 --- a/op-mode-definitions/poweroff.xml +++ b/op-mode-definitions/poweroff.xml @@ -4,35 +4,53 @@ <properties> <help>Poweroff the system</help> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --poweroff now</command> + <children> <leafNode name="now"> <properties> <help>Poweroff the system without confirmation</help> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff --now</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff now</command> </leafNode> - + <leafNode name="cancel"> <properties> <help>Cancel a pending poweroff</help> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff_cancel</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --cancel</command> </leafNode> + <tagNode name="in"> + <properties> + <help>Poweroff in X minutes</help> + <completionHelp> + <list><Minutes></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $4</command> + + </tagNode> <tagNode name="at"> <properties> <help>Poweroff at a specific time</help> <completionHelp> - <list>HH:MM</list> - <list>MMDDYY</list> - <list>midnight</list> - <list>noon</list> + <list><HH:MM></list> </completionHelp> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-poweroff.pl --action poweroff_at --at_time '$3'</command> - + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3</command> + <children> + <tagNode name="date"> + <properties> + <help>Poweroff at a specific date</help> + <completionHelp> + <list><DDMMYYYY> <DD/MM/YYYY> <DD.MM.YYYY> <DD:MM:YYYY></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $5</command> + </tagNode> + </children> </tagNode> </children> diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml index 2c5a85d95..340c8ca82 100644 --- a/op-mode-definitions/reboot.xml +++ b/op-mode-definitions/reboot.xml @@ -4,35 +4,53 @@ <properties> <help>Reboot the system</help> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --reboot now</command> + <children> <leafNode name="now"> <properties> <help>Reboot the system without confirmation</help> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot --now</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot now</command> </leafNode> - + <leafNode name="cancel"> <properties> <help>Cancel a pending reboot</help> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_cancel</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --cancel</command> </leafNode> + <tagNode name="in"> + <properties> + <help>Reboot in X minutes</help> + <completionHelp> + <list><Minutes></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $4</command> + + </tagNode> <tagNode name="at"> <properties> <help>Reboot at a specific time</help> <completionHelp> - <list>HH:MM</list> - <list>MMDDYY</list> - <list>midnight</list> - <list>noon</list> + <list><HH:MM></list> </completionHelp> </properties> - <command>/opt/vyatta/bin/sudo-users/vyatta-reboot.pl --action reboot_at --at_time '$3'</command> - + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3</command> + <children> + <tagNode name="date"> + <properties> + <help>Reboot at a specific date</help> + <completionHelp> + <list><DDMMYYYY> <DD/MM/YYYY> <DD.MM.YYYY> <DD:MM:YYYY></list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $5</command> + </tagNode> + </children> </tagNode> </children> |