From 0eccc7b2db884b36cb46467791a0ad50aa8555f8 Mon Sep 17 00:00:00 2001
From: votdev <votdev@gmx.de>
Date: Tue, 27 Sep 2016 12:59:06 +0200
Subject: [PATCH] Fix bug in omv-firstaid.

---
 deb/openmediavault/debian/changelog                   |  6 ++++++
 .../firstaid/modules.d/10configure_network.py         | 11 +++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/deb/openmediavault/debian/changelog b/deb/openmediavault/debian/changelog
index 32f3293486a..eca14dc628f 100644
--- a/deb/openmediavault/debian/changelog
+++ b/deb/openmediavault/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault (3.0.41) stable; urgency=low
+
+  * Fix bug in omv-firstaid.
+
+ -- Volker Theile <volker.theile@openmediavault.org>  Tue, 27 Sep 2016 12:42:50 +0200
+
 openmediavault (3.0.40) stable; urgency=low
 
   * Harden installation script.
diff --git a/deb/openmediavault/usr/share/openmediavault/firstaid/modules.d/10configure_network.py b/deb/openmediavault/usr/share/openmediavault/firstaid/modules.d/10configure_network.py
index 4241ab63a3d..70cc36b2db0 100755
--- a/deb/openmediavault/usr/share/openmediavault/firstaid/modules.d/10configure_network.py
+++ b/deb/openmediavault/usr/share/openmediavault/firstaid/modules.d/10configure_network.py
@@ -37,10 +37,10 @@ def execute(self):
 		netmask = None
 		gateway = None
 		method = "dhcp"
-		address6 = None
+		address6 = ""
 		method6 = "manual"
 		netmask6 = 64
-		gateway6 = None
+		gateway6 = ""
 		wol = False
 		dns_nameservers = None
 		wpa_ssid = None
@@ -167,7 +167,8 @@ def execute(self):
 				else:
 					method6 = "static"
 				# Get static IPv6 address.
-				while not address:
+				address6 = None
+				while not address6:
 					(code, address6) = d.inputbox(
 						"Please enter the IPv6 address.",
 						backtitle=self.description,
@@ -188,11 +189,12 @@ def execute(self):
 							height=5, width=38)
 						continue
 				# Get the prefix length.
+				netmask6 = None
 				while not netmask6:
 					(code, netmask6) = d.inputbox(
 						"Please enter the IPv6 prefix length.",
 						backtitle=self.description,
-						clear=True, height=8, width=64, init="")
+						clear=True, height=8, width=64, init="64")
 					if code != d.OK:
 						return 0
 					if not netmask6:
@@ -209,6 +211,7 @@ def execute(self):
 							height=5, width=33)
 						continue
 				# Get default IPv6 gateway.
+				gateway6 = None
 				while not gateway6:
 					(code, gateway6) = d.inputbox(
 						"Please enter the default IPv6 gateway.",