From d4226999b124951b617d5ecae69f5061bfe0b726 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 26 Mar 2019 13:45:30 +0100
Subject: [serversetup-bwlp-ipxe] Check for valid IP address before import

---
 modules-available/serversetup-bwlp-ipxe/lang/de/messages.json | 1 +
 modules-available/serversetup-bwlp-ipxe/lang/en/messages.json | 1 +
 modules-available/serversetup-bwlp-ipxe/page.inc.php          | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/modules-available/serversetup-bwlp-ipxe/lang/de/messages.json b/modules-available/serversetup-bwlp-ipxe/lang/de/messages.json
index 3dfcf088..cc8af749 100644
--- a/modules-available/serversetup-bwlp-ipxe/lang/de/messages.json
+++ b/modules-available/serversetup-bwlp-ipxe/lang/de/messages.json
@@ -18,5 +18,6 @@
     "menu-set-default": "Standardmen\u00fc wurde gesetzt",
     "missing-bootentry-data": "Fehlende Daten f\u00fcr den Men\u00fceintrag",
     "no-ip-addr-set": "Bitte w\u00e4hlen Sie die prim\u00e4re IP-Adresse des Servers",
+    "no-ip-set": "Kann Import alter Konfiguration nicht ausf\u00fchren. Bitte zuerst die prim\u00e4re IP-Adresse des Servers festlegen.",
     "unknown-bootentry-type": "Unbekannter Eintrags-Typ: {{0}}"
 }
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp-ipxe/lang/en/messages.json b/modules-available/serversetup-bwlp-ipxe/lang/en/messages.json
index 8c1e2791..9dafe62b 100644
--- a/modules-available/serversetup-bwlp-ipxe/lang/en/messages.json
+++ b/modules-available/serversetup-bwlp-ipxe/lang/en/messages.json
@@ -18,5 +18,6 @@
     "menu-set-default": "Default menu has been set",
     "missing-bootentry-data": "Missing data for menu item",
     "no-ip-addr-set": "Please set the server's primary IP address",
+    "no-ip-set": "Cannot import old configuration. Please set the primary IP address first.",
     "unknown-bootentry-type": "Unknown item type: {{0}}"
 }
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 9f8aa431..150796a5 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -306,6 +306,10 @@ class Page_ServerSetup extends Page
 		}
 
 		if (empty($bootentryTable)) {
+			if (Property::getServerIp() === false || Property::getServerIp() === 'invalid') {
+				Message::addError('no-ip-set');
+				Util::redirect('?do=serversetup&show=address');
+			}
 			IPxe::importLegacyMenu(true);
 			$num = IPxe::importSubnetPxeMenus('/srv/openslx/tftp/pxelinux.cfg');
 			if ($num > 0) {
-- 
cgit v1.2.3-55-g7522