From 55ee5d903817e3a80fb6272d790dcce1044f8a9b Mon Sep 17 00:00:00 2001
From: Runar Borge <runar@borge.nu>
Date: Sun, 19 Aug 2018 22:25:34 +0200
Subject: T689: Reboot/Poweroff now not working after last changes

---
 op-mode-definitions/poweroff.xml | 4 ++--
 op-mode-definitions/reboot.xml   | 4 ++--
 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()
-- 
cgit v1.2.3