summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neves2013-05-14 20:00:33 +0200
committerMichael Neves2013-05-14 20:00:33 +0200
commit87eeb5efa6e4c4869cac86545a3576418c70f3e9 (patch)
treeb13d30a2df13dcf853c15aea2e258c9ece35b14d
parentvmware-usbarbitrator fixed (diff)
parentMerge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff)
downloadtm-scripts-87eeb5efa6e4c4869cac86545a3576418c70f3e9.tar.gz
tm-scripts-87eeb5efa6e4c4869cac86545a3576418c70f3e9.tar.xz
tm-scripts-87eeb5efa6e4c4869cac86545a3576418c70f3e9.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
-rwxr-xr-xdata/install_server.sh7
-rwxr-xr-xdata/pxe/mboot.c32bin0 -> 34396 bytes
-rwxr-xr-xdata/pxe/menu.c32bin0 -> 56164 bytes
-rw-r--r--data/pxe/openslx.pngbin0 -> 21791 bytes
-rw-r--r--data/pxe/pxelinux.0 (renamed from data/pxelinux.0)bin26621 -> 26621 bytes
-rwxr-xr-xdata/pxe/vesamenu.c32bin0 -> 155792 bytes
6 files changed, 4 insertions, 3 deletions
diff --git a/data/install_server.sh b/data/install_server.sh
index be1fc91c..dc0e30bc 100755
--- a/data/install_server.sh
+++ b/data/install_server.sh
@@ -135,7 +135,7 @@ git clone git://git.ipxe.org/ipxe.git
cd ipxe
# iPXE-Konfiguration einschreiben
-cat > pxelinux.ipxe << HEREEND
+cat > ipxelinux.ipxe << HEREEND
#!ipxe
set use-cached 1
dhcp net0
@@ -146,7 +146,8 @@ boot pxelinux.0
HEREEND
cd src
-make bin/undionly.kkkpxe EMBED=../ipxelinux.ipxe,/opt/openslx/tm-scripts/data/pxelinux.0
+make bin/undionly.kkkpxe EMBED=../ipxelinux.ipxe,/opt/openslx/tm-scripts/data/pxe/pxelinux.0
+cp /opt/openslx/tm-scripts/data/pxe/* /srv/openslx/tftp/
ERR=$?
if [ "$ERR" -gt 0 ]; then
@@ -154,7 +155,7 @@ if [ "$ERR" -gt 0 ]; then
exit 1
fi
-cp "ipxelinux.0" "/srv/openslx/tftp/"
+cp "bin/undionly.kkkpxe" "/srv/openslx/tftp/ipxelinux.0"
echo "....Fertig"
echo "mltk liegt nun im Verzeichnis /opt/openslx/tm-scripts"
diff --git a/data/pxe/mboot.c32 b/data/pxe/mboot.c32
new file mode 100755
index 00000000..5a0343aa
--- /dev/null
+++ b/data/pxe/mboot.c32
Binary files differ
diff --git a/data/pxe/menu.c32 b/data/pxe/menu.c32
new file mode 100755
index 00000000..488824e1
--- /dev/null
+++ b/data/pxe/menu.c32
Binary files differ
diff --git a/data/pxe/openslx.png b/data/pxe/openslx.png
new file mode 100644
index 00000000..79feff2c
--- /dev/null
+++ b/data/pxe/openslx.png
Binary files differ
diff --git a/data/pxelinux.0 b/data/pxe/pxelinux.0
index cf0d3ac6..cf0d3ac6 100644
--- a/data/pxelinux.0
+++ b/data/pxe/pxelinux.0
Binary files differ
diff --git a/data/pxe/vesamenu.c32 b/data/pxe/vesamenu.c32
new file mode 100755
index 00000000..06119cd2
--- /dev/null
+++ b/data/pxe/vesamenu.c32
Binary files differ