From 729cb9d21343687a2b0f9dcd08902bcb877349ce Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Tue, 14 May 2013 17:27:35 +0200
Subject: add ipxe

---
 data/install_server.sh | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'data')

diff --git a/data/install_server.sh b/data/install_server.sh
index ca67a6ed..597d056b 100755
--- a/data/install_server.sh
+++ b/data/install_server.sh
@@ -113,6 +113,44 @@ if [ "$ERR" -gt 0 ]; then
         exit 1
 fi
 
+echo " ##### Setup iPXE #######"
+
+mkdir -p /opt/ipxe
+cd /opt/ipxe
+git clone git://git.ipxe.org/people/mcb30/syslinux.git
+
+cd /opt/ipxe/syslinux
+git checkout ipxelinux
+
+cd /opt/ipxe/syslinux/ipxe/src
+make NO_WERROR=1 
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Fehler beim kompilieren von ipxe - Abbruch!"
+        exit 1
+fi
+
+cd /opt/ipxe/syslinux/ipxe
+
+# iPXE-Konfiguration einschreiben
+cat>pxelinux.ipxe<<HEREEND         # 
+#!ipxe
+set use-cached 1
+dhcp net0
+set net0.dhcp/next-server $SERVER_IP
+set net0.dhcp/filename ipxelinux.0
+imgload pxelinux.0
+boot pxelinux.0
+HEREEND
+
+make
+ERR=$?
+if [ "$ERR" -gt 0 ]; then
+        echo "Fehler beim kompilieren von ipxelinux.0 - Abbruch!"
+        exit 1
+fi
+
+cp ipxelinux.0 /srv/openslx/tftp
 
 echo " ##### Klone das mltk repository ########"
 
-- 
cgit v1.2.3-55-g7522


From c14d8efee467c2c6be4d3f80b8d7a0c367eab39c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 May 2013 17:37:33 +0200
Subject: ipxe fixes

---
 data/install_server.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/install_server.sh b/data/install_server.sh
index 597d056b..f8026026 100755
--- a/data/install_server.sh
+++ b/data/install_server.sh
@@ -1,6 +1,12 @@
 #!/bin/sh
 
-TOOLS="git squashfs-tools rsync lighttpd tftpd"
+if [ $# -lt 1 ]; then
+	echo "Usage: $0 <this server's ip>"
+	exit 1
+fi
+SERVER_IP="$1"
+
+TOOLS="git squashfs-tools rsync lighttpd tftpd gcc binutils make"
 
 for tool in $TOOLS; do
 	echo " ###### Installiere $tool ##########"
@@ -150,7 +156,7 @@ if [ "$ERR" -gt 0 ]; then
         exit 1
 fi
 
-cp ipxelinux.0 /srv/openslx/tftp
+cp ipxelinux.0 /srv/openslx/tftp/
 
 echo " ##### Klone das mltk repository ########"
 
-- 
cgit v1.2.3-55-g7522


From 629ad395bb6abecd5c104785aa4cc86380d0b6f1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 May 2013 18:47:08 +0200
Subject: change ipxe source

---
 data/install_server.sh | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

(limited to 'data')

diff --git a/data/install_server.sh b/data/install_server.sh
index f8026026..be1fc91c 100755
--- a/data/install_server.sh
+++ b/data/install_server.sh
@@ -6,7 +6,7 @@ if [ $# -lt 1 ]; then
 fi
 SERVER_IP="$1"
 
-TOOLS="git squashfs-tools rsync lighttpd tftpd gcc binutils make"
+TOOLS="git squashfs-tools rsync lighttpd tftpd gcc binutils make nasm"
 
 for tool in $TOOLS; do
 	echo " ###### Installiere $tool ##########"
@@ -119,27 +119,23 @@ if [ "$ERR" -gt 0 ]; then
         exit 1
 fi
 
+echo " ##### Klone das mltk repository ########"
+
+mkdir -p /opt/openslx
+cd /opt/openslx
+
+git clone git://git.openslx.org/openslx-ng/tm-scripts
+
 echo " ##### Setup iPXE #######"
 
 mkdir -p /opt/ipxe
 cd /opt/ipxe
-git clone git://git.ipxe.org/people/mcb30/syslinux.git
+git clone git://git.ipxe.org/ipxe.git
 
-cd /opt/ipxe/syslinux
-git checkout ipxelinux
-
-cd /opt/ipxe/syslinux/ipxe/src
-make NO_WERROR=1 
-ERR=$?
-if [ "$ERR" -gt 0 ]; then
-        echo "Fehler beim kompilieren von ipxe - Abbruch!"
-        exit 1
-fi
-
-cd /opt/ipxe/syslinux/ipxe
+cd ipxe
 
 # iPXE-Konfiguration einschreiben
-cat>pxelinux.ipxe<<HEREEND         # 
+cat > pxelinux.ipxe << HEREEND
 #!ipxe
 set use-cached 1
 dhcp net0
@@ -149,24 +145,19 @@ imgload pxelinux.0
 boot pxelinux.0
 HEREEND
 
-make
+cd src
+make bin/undionly.kkkpxe EMBED=../ipxelinux.ipxe,/opt/openslx/tm-scripts/data/pxelinux.0
+
 ERR=$?
 if [ "$ERR" -gt 0 ]; then
         echo "Fehler beim kompilieren von ipxelinux.0 - Abbruch!"
         exit 1
 fi
 
-cp ipxelinux.0 /srv/openslx/tftp/
-
-echo " ##### Klone das mltk repository ########"
-
-mkdir -p /opt/openslx
-cd /opt/openslx
-
-git clone git://git.openslx.org/openslx-ng/tm-scripts
+cp "ipxelinux.0" "/srv/openslx/tftp/"
 
 echo "....Fertig"
-echo "mltk liegt nun im Verzeichnis $(pwd)/tm-scripts"
+echo "mltk liegt nun im Verzeichnis /opt/openslx/tm-scripts"
 echo "Extrahieren und Erstellen der Basissystemdaten:"
 echo "./mltk remote stage31 -b"
 echo "./mltk remote stage32 -b"
-- 
cgit v1.2.3-55-g7522