summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-10-09 19:33:17 +0200
committerDaniil Baturin <daniil@baturin.org>2018-10-09 19:34:03 +0200
commit9be759b8bb233c2da6d5a50ebc44f64918c76d8c (patch)
treedea19bac7d2a50b1c7ccccbefc8323b788d15ff3
parent44355e6525daec62120601073065f63c9f9a7993 (diff)
downloadvyos-1x-9be759b8bb233c2da6d5a50ebc44f64918c76d8c.tar.gz
vyos-1x-9be759b8bb233c2da6d5a50ebc44f64918c76d8c.zip
T883: handle keyboard interrupts in the wireguard keypair command.
-rwxr-xr-xsrc/op_mode/wireguard.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/op_mode/wireguard.py b/src/op_mode/wireguard.py
index 14ee66aaf..73da72aa7 100755
--- a/src/op_mode/wireguard.py
+++ b/src/op_mode/wireguard.py
@@ -49,9 +49,12 @@ def genkey():
""" helper function to check, regenerate the keypair """
old_umask = os.umask(0o077)
if os.path.exists(pk) and os.path.exists(pub):
- choice = input("You already have a wireguard key-pair already, do you want to re-generate? [y/n] ")
- if choice == 'y' or choice == 'Y':
- generate_keypair()
+ try:
+ choice = input("You already have a wireguard key-pair already, do you want to re-generate? [y/n] ")
+ if choice == 'y' or choice == 'Y':
+ generate_keypair()
+ except KeyboardInterrupt:
+ sys.exit(0)
else:
if not os.path.exists(dir):
os.mkdir(dir)