diff options
| author | Runar Borge <runar@borge.nu> | 2018-08-16 20:00:43 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2018-08-16 20:00:43 +0200 |
| commit | 519192f0d82aa920b9870547b92d8f1a22837158 (patch) | |
| tree | fa1f66257bedf2241e8c142202c1760db7eb235e /op-mode-definitions | |
| parent | d822de344c8425b793e0595ba1d0a70c033d2cc3 (diff) | |
| download | vyos-1x-519192f0d82aa920b9870547b92d8f1a22837158.tar.gz vyos-1x-519192f0d82aa920b9870547b92d8f1a22837158.zip | |
T689: Rewritten poweroff/reboot script to use systemd-shutdownd service
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/poweroff.xml | 34 | ||||
| -rw-r--r-- | op-mode-definitions/reboot.xml | 28 |
2 files changed, 39 insertions, 23 deletions
diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml index 07cea7927..e6cab0222 100644 --- a/op-mode-definitions/poweroff.xml +++ b/op-mode-definitions/poweroff.xml @@ -2,37 +2,45 @@ <interfaceDefinition> <node name="poweroff"> <properties> - <help>Poweroff the system</help> + <help>Shutdown 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> + <help>Shutdown the system imidiently</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> + <help>Cancel a pending reboot</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>Reboot in X minutes</help> + <completionHelp> + <list>Minutes</list> + </completionHelp> + </properties> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff '$3'</command> + + </tagNode> <tagNode name="at"> <properties> - <help>Poweroff at a specific time</help> + <help>Reboot at a specific time</help> <completionHelp> <list>HH:MM</list> - <list>MMDDYY</list> - <list>midnight</list> - <list>noon</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> + </tagNode> </children> diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml index 2c5a85d95..ebdd5691a 100644 --- a/op-mode-definitions/reboot.xml +++ b/op-mode-definitions/reboot.xml @@ -4,35 +4,43 @@ <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> + <help>Reboot the system imidiently</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</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> </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> + </tagNode> </children> |