diff options
| author | Runar Borge <runar@borge.nu> | 2018-08-17 00:22:16 +0200 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2018-08-17 00:22:16 +0200 |
| commit | ce35b9830e538bce50b42272bb457201dfae102e (patch) | |
| tree | d6358a8526171754b8453cedbfc171217b15fa3a /op-mode-definitions | |
| parent | 0a9bcf9a7706e4bc7f4884419790c8e3f1601d39 (diff) | |
| download | vyos-1x-ce35b9830e538bce50b42272bb457201dfae102e.tar.gz vyos-1x-ce35b9830e538bce50b42272bb457201dfae102e.zip | |
T689: Added support for specifying date on poweroff and reboot
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/poweroff.xml | 24 | ||||
| -rw-r--r-- | op-mode-definitions/reboot.xml | 16 |
2 files changed, 30 insertions, 10 deletions
diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml index 725d10225..bb2eedcb1 100644 --- a/op-mode-definitions/poweroff.xml +++ b/op-mode-definitions/poweroff.xml @@ -16,31 +16,41 @@ <leafNode name="cancel"> <properties> - <help>Cancel a pending reboot</help> + <help>Cancel a pending poweroff</help> </properties> <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --cancel</command> </leafNode> <tagNode name="in"> <properties> - <help>Reboot in X minutes</help> + <help>Poweroff in X minutes</help> <completionHelp> - <list>Minutes</list> + <list><Minutes></list> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff '$3'</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $4</command> </tagNode> <tagNode name="at"> <properties> - <help>Reboot at a specific time</help> + <help>Poweroff at a specific time</help> <completionHelp> <list>HH:MM</list> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff '$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 214a39633..703304ff8 100644 --- a/op-mode-definitions/reboot.xml +++ b/op-mode-definitions/reboot.xml @@ -25,10 +25,10 @@ <properties> <help>Reboot in X minutes</help> <completionHelp> - <list>Minutes</list> + <list><Minutes></list> </completionHelp> </properties> - <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $4</command> </tagNode> @@ -40,7 +40,17 @@ </completionHelp> </properties> <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> |