From 289d752a306b77bdc0cfb77efc3588860a35d74e Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Tue, 9 Oct 2018 19:33:17 +0200
Subject: T883: handle keyboard interrupts in the wireguard keypair command.

---
 src/op_mode/wireguard.py | 9 ++++++---
 1 file 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)
-- 
cgit v1.2.3


From bde737236d7f6b9680f4f42fa95152258af6bf98 Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Wed, 10 Oct 2018 14:21:00 -0700
Subject: T886: validation logic in `interfaces wireguard wgX address x.x.x.x
 broken

---
 interface-definitions/wireguard.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index 5e9c41ace..51876d6d6 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -29,7 +29,7 @@
               </valueHelp>
               <multi/>
               <constraint>
-                <validator name="interface-address"/>
+                <validator name="ip-prefix"/>
               </constraint>
             </properties>
           </leafNode>
-- 
cgit v1.2.3