From 519192f0d82aa920b9870547b92d8f1a22837158 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 16 Aug 2018 20:00:43 +0200 Subject: T689: Rewritten poweroff/reboot script to use systemd-shutdownd service --- src/op_mode/powerctrl.py | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100755 src/op_mode/powerctrl.py (limited to 'src/op_mode') diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py new file mode 100755 index 000000000..0200a09e8 --- /dev/null +++ b/src/op_mode/powerctrl.py @@ -0,0 +1,102 @@ +#!/usr/bin/env python3 +import os +import sys +import argparse +from datetime import datetime, timedelta, time as type_time, date as type_date +from subprocess import check_output,CalledProcessError,STDOUT +import re + +def yn(msg, default=False): + default_msg = "[Y/n]" if default else "[y/N]" + while True: + sys.stdout.write("%s %s " % (msg,default_msg)) + c = input().lower() + if c == '': + return default + elif c in ("y", "ye","yes"): + return True + elif c in ("n", "no"): + return False + else: + sys.stdout.write("Please respond with yes/y or no/n\n") + + +def valid_time(s): + try: + a = datetime.strptime(s, "%H:%M") + return True + except ValueError: + return False + + +def check_shutdown(): + try: + cmd = check_output(["/bin/systemctl","status","systemd-shutdownd.service"]) + #Shutodwn is scheduled + r = re.findall(r'Status: \"(.*)\"\n', cmd.decode())[0] + print(r) + except CalledProcessError as e: + #Shutdown is not scheduled + print("Shutdown is not scheduled") + +def cancel_shutdown(): + try: + cmd = check_output(["/sbin/shutdown","-c"]) + except CalledProcessError as e: + sys.exit("Error aborting shutdown: %s" % e) + +def execute_shutdown(time, reboot = True, ask=True): + if not ask: + action = "reboot" if reboot else "poweroff" + if not yn("Are you sure you want to %s this system?" % action): + sys.exit(0) + + if not (time.isdigit() or valid_time(time) or time.lower() == "now"): + sys.exit("minutes (45), valid time (12:34) or 'now' needs to be specified") + + action = "-r" if reboot else "-P" + cmd = check_output(["/sbin/shutdown",action,time],stderr=STDOUT) + + print(cmd.decode().split(",",1)[0]) + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument("--yes", "-y", + help="dont as for shutdown", + action="store_true", + dest="yes") + action = parser.add_mutually_exclusive_group(required=True) + action.add_argument("--reboot", "-r", + help="Reboot the system", + nargs="?", + metavar="Minutes|HH:MM") + + action.add_argument("--poweroff", "-p", + help="Poweroff the system", + nargs="?", + metavar="Minutes|HH:MM") + + action.add_argument("--cancel", "-c", + help="Cancel pending shutdown", + action="store_true") + + action.add_argument("--check", + help="Check pending chutdown", + action="store_true") + args = parser.parse_args() + + try: + if args.reboot: + execute_shutdown(args.reboot, reboot=True, ask=args.yes) + if args.poweroff: + execute_shutdown(args.poweroff, reboot=False,ask=args.yes) + if args.cancel: + cancel_shutdown() + if args.check: + check_shutdown() + except KeyboardInterrupt: + sys.exit("Interrupted") + + +if __name__ == "__main__": + main() -- cgit v1.2.3 From ce35b9830e538bce50b42272bb457201dfae102e Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 17 Aug 2018 00:22:16 +0200 Subject: T689: Added support for specifying date on poweroff and reboot --- op-mode-definitions/poweroff.xml | 24 ++++++++++++----- op-mode-definitions/reboot.xml | 16 ++++++++--- src/op_mode/powerctrl.py | 58 +++++++++++++++++++++++++++++++++------- 3 files changed, 79 insertions(+), 19 deletions(-) (limited to 'src/op_mode') 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 @@ - Cancel a pending reboot + Cancel a pending poweroff sudo ${vyos_op_scripts_dir}/powerctrl.py --cancel - Reboot in X minutes + Poweroff in X minutes - Minutes + <Minutes> - sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff '$3' + sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $4 - Reboot at a specific time + Poweroff at a specific time HH:MM - sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff '$3' - + sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 + + + + Poweroff at a specific date + + <DDMMYYYY> <DD/MM/YYYY> <DD.MM.YYYY> <DD:MM:YYYY> + + + sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --poweroff $3 $5 + + 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 @@ Reboot in X minutes - Minutes + <Minutes> - sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 + sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $4 @@ -40,7 +40,17 @@ sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 - + + + + Reboot at a specific date + + <DDMMYYYY> <DD/MM/YYYY> <DD.MM.YYYY> <DD:MM:YYYY> + + + sudo ${vyos_op_scripts_dir}/powerctrl.py --yes --reboot $3 $5 + + diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py index 0200a09e8..f73d6c005 100755 --- a/src/op_mode/powerctrl.py +++ b/src/op_mode/powerctrl.py @@ -23,10 +23,25 @@ def yn(msg, default=False): def valid_time(s): try: - a = datetime.strptime(s, "%H:%M") - return True + return datetime.strptime(s, "%H:%M").time() except ValueError: - return False + return None + + +def valid_date(s): + try: + return datetime.strptime(s, "%d%m%Y").date() + except ValueError: + try: + return datetime.strptime(s, "%d/%m/%Y").date() + except ValueError: + try: + return datetime.strptime(s, "%d.%m.%Y").date() + except ValueError: + try: + return datetime.strptime(s, "%d:%m:%Y").date() + except ValueError: + return None def check_shutdown(): @@ -51,11 +66,36 @@ def execute_shutdown(time, reboot = True, ask=True): if not yn("Are you sure you want to %s this system?" % action): sys.exit(0) - if not (time.isdigit() or valid_time(time) or time.lower() == "now"): - sys.exit("minutes (45), valid time (12:34) or 'now' needs to be specified") - action = "-r" if reboot else "-P" - cmd = check_output(["/sbin/shutdown",action,time],stderr=STDOUT) + + if len(time) == 0: + cmd = check_output(["/sbin/shutdown",action,"now"],stderr=STDOUT) + print(cmd.decode().split(",",1)[0]) + return + + # Try to extract date from the first argument + if len(time) == 1: + time = time[0].split(" ",1) + + if len(time) == 1: + ts=valid_time(time[0]) + if time[0].isdigit() or valid_time(time[0]): + cmd = check_output(["/sbin/shutdown",action,time[0]],stderr=STDOUT) + else: + sys.exit("Timestamp needs to be in format of 12:34") + + elif len(time) == 2: + ts = valid_time(time[0]) + ds = valid_date(time[1]) + if ts and ds: + t = datetime.combine(ds, ts) + td = t-datetime.now() + t2 = 1+int(td.total_seconds())//60 # Get total minutes + cmd = check_output(["/sbin/shutdown",action,str(t2)],stderr=STDOUT) + else: + sys.exit("Timestamp needs to be in format of 12:34\nDatestamp in the format of DD.MM.YY") + else: + sys.exit("Could not decode time and date") print(cmd.decode().split(",",1)[0]) @@ -68,12 +108,12 @@ def main(): action = parser.add_mutually_exclusive_group(required=True) action.add_argument("--reboot", "-r", help="Reboot the system", - nargs="?", + nargs="*", metavar="Minutes|HH:MM") action.add_argument("--poweroff", "-p", help="Poweroff the system", - nargs="?", + nargs="*", metavar="Minutes|HH:MM") action.add_argument("--cancel", "-c", -- cgit v1.2.3