From c2a6dfb649107ce3ad64162e2bb2c3c7275650fb Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 12 Feb 2019 14:55:12 +0100
Subject: [serversetup*] PXELinux and iPXE side-by-side

---
 modules-available/serversetup-bwlp/hooks/bootup.inc.php       | 11 -----------
 modules-available/serversetup-bwlp/hooks/ipxe-update.inc.php  | 10 ----------
 modules-available/serversetup-bwlp/hooks/main-warning.inc.php |  6 ------
 3 files changed, 27 deletions(-)
 delete mode 100644 modules-available/serversetup-bwlp/hooks/bootup.inc.php
 delete mode 100644 modules-available/serversetup-bwlp/hooks/ipxe-update.inc.php
 delete mode 100644 modules-available/serversetup-bwlp/hooks/main-warning.inc.php

(limited to 'modules-available/serversetup-bwlp/hooks')

diff --git a/modules-available/serversetup-bwlp/hooks/bootup.inc.php b/modules-available/serversetup-bwlp/hooks/bootup.inc.php
deleted file mode 100644
index 50ac04ae..00000000
--- a/modules-available/serversetup-bwlp/hooks/bootup.inc.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$ret = IPxe::importLegacyMenu(false);
-if ($ret !== false) {
-	$num = IPxe::importPxeMenus('/srv/openslx/tftp/pxelinux.cfg');
-	if ($num > 0) {
-		EventLog::info('Imported old PXELinux menu, with ' . $num . ' additional IP-range based menus.');
-	} else {
-		EventLog::info('Imported old PXELinux menu.');
-	}
-}
diff --git a/modules-available/serversetup-bwlp/hooks/ipxe-update.inc.php b/modules-available/serversetup-bwlp/hooks/ipxe-update.inc.php
deleted file mode 100644
index 166e80a8..00000000
--- a/modules-available/serversetup-bwlp/hooks/ipxe-update.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$data = [
-	'ipaddress' => Property::getServerIp()
-];
-$task = Taskmanager::submit('CompileIPxeNew', $data);
-if (!isset($task['id']))
-return false;
-Property::set('ipxe-task-id', $task['id'], 15);
-return $task['id'];
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp/hooks/main-warning.inc.php b/modules-available/serversetup-bwlp/hooks/main-warning.inc.php
deleted file mode 100644
index a2eba6ff..00000000
--- a/modules-available/serversetup-bwlp/hooks/main-warning.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-if (!preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', Property::getServerIp())) {
-	Message::addError('serversetup.no-ip-addr-set', true);
-	$needSetup = true;
-}
-- 
cgit v1.2.3-55-g7522