summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdata/install_server.sh41
-rw-r--r--data/pxelinux.0bin0 -> 26621 bytes
-rw-r--r--remote/modules/vmplayer/vmplayer.build4
3 files changed, 19 insertions, 26 deletions
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"
diff --git a/data/pxelinux.0 b/data/pxelinux.0
new file mode 100644
index 00000000..cf0d3ac6
--- /dev/null
+++ b/data/pxelinux.0
Binary files differ
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index dbe170a9..8589c245 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -1,7 +1,9 @@
fetch_source() {
#mount vmware bundle directory
[ ! -d /mnt/store/vmware ] && mkdir -p /mnt/store/vmware
- mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting."
+ if [ "x$(ls /mnt/store/vmware)" == "x" ]; then
+ mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting."
+ fi
ARCH=$(uname -m)
[ "$ARCH" = "i686" ] && ARCH=i386
local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)"