diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-08-20 20:02:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 20:02:14 +0200 |
| commit | d67c3a7b9b3fcb1e79d2cee61627ed869847673f (patch) | |
| tree | 86defbc7c9092469ccd022cee080f817dafc3fee | |
| parent | aa8b8e574e44917f5bd1a777fc9b816fe9d1580c (diff) | |
| parent | 55ee5d903817e3a80fb6272d790dcce1044f8a9b (diff) | |
| download | vyos-1x-d67c3a7b9b3fcb1e79d2cee61627ed869847673f.tar.gz vyos-1x-d67c3a7b9b3fcb1e79d2cee61627ed869847673f.zip | |
Merge pull request #36 from runborg/test
T689: Reboot/Poweroff now not working after last changes
| -rw-r--r-- | op-mode-definitions/poweroff.xml | 4 | ||||
| -rw-r--r-- | op-mode-definitions/reboot.xml | 4 | ||||
| -rwxr-xr-x | src/op_mode/powerctrl.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml index ff27f4f4d..e2483fefc 100644 --- a/op-mode-definitions/poweroff.xml +++ b/op-mode-definitions/poweroff.xml @@ -4,14 +4,14 @@ <properties> <help>Poweroff the system</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --poweroff now</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --poweroff</command> <children> <leafNode name="now"> <properties> <help>Poweroff the system without confirmation</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff now</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff</command> </leafNode> <leafNode name="cancel"> diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml index 340c8ca82..affdffd98 100644 --- a/op-mode-definitions/reboot.xml +++ b/op-mode-definitions/reboot.xml @@ -4,14 +4,14 @@ <properties> <help>Reboot the system</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --reboot now</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --reboot</command> <children> <leafNode name="now"> <properties> <help>Reboot the system without confirmation</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot now</command> + <command>sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot</command> </leafNode> <leafNode name="cancel"> diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py index f73d6c005..8a66b3afd 100755 --- a/src/op_mode/powerctrl.py +++ b/src/op_mode/powerctrl.py @@ -126,9 +126,9 @@ def main(): args = parser.parse_args() try: - if args.reboot: + if args.reboot is not None: execute_shutdown(args.reboot, reboot=True, ask=args.yes) - if args.poweroff: + if args.poweroff is not None: execute_shutdown(args.poweroff, reboot=False,ask=args.yes) if args.cancel: cancel_shutdown() |