summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--satellit_installer/includes/00-dirs.inc1
-rw-r--r--satellit_installer/includes/00-variables.inc2
-rw-r--r--satellit_installer/includes/10-install_ipxe.inc6
-rwxr-xr-xsatellit_installer/satellit_installer6
4 files changed, 12 insertions, 3 deletions
diff --git a/satellit_installer/includes/00-dirs.inc b/satellit_installer/includes/00-dirs.inc
index 77bdead..5ed3328 100644
--- a/satellit_installer/includes/00-dirs.inc
+++ b/satellit_installer/includes/00-dirs.inc
@@ -7,4 +7,5 @@ export OPENSLXSRVDIR="/srv/openslx/"
export LDADPDIR="/opt/ldadp/"
export TFTPDIR="/srv/openslx/tftp"
export WWWDIR="/srv/openslx/www"
+export IPXEDIR="$OPENSLXDIR/ipxe"
readonly CONFIGDIR DMSDDIR TASKMANDIR OPENSLXDIR OPENSLXSRVDIR LDADPDIR SYNCDAEMONDIR TFTPDIR WWWDIR
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index 96ba7bd..84a66dc 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -37,5 +37,5 @@ PACKAGELIST_WITH_RECOMMENDS="
### http for static files:
HTTP_BASE="http://files.bwlp.ks.uni-freiburg.de/install/"
HTTP_FILES="dmsd.jar db_openslx_dump.sql openslx_tftp.tar.gz"
-HTTP_FILES+=" taskmanager.tar.gz db_sat_dump.sql openslx.tar.gz"
+HTTP_FILES+=" taskmanager.tar.gz db_sat_dump.sql"
HTTP_FILES+=" slx-admin.tar.gz syslinux6.tar.gz syslinux4.tar.gz"
diff --git a/satellit_installer/includes/10-install_ipxe.inc b/satellit_installer/includes/10-install_ipxe.inc
new file mode 100644
index 0000000..d8c9326
--- /dev/null
+++ b/satellit_installer/includes/10-install_ipxe.inc
@@ -0,0 +1,6 @@
+
+install_ipxe() {
+ [ -z "$1" ] && perror "Call install_ipxe with target directory!"
+ git clone --depth 1 git://git.ipxe.org/ipxe.git "$1" || perror "Cloning ipxe repo failed"
+ wget -O "$1/pxelinux.0" "$HTTP_BASE/pxelinux.0" || perror "Could not download pxelinux 4 from $HTTP_BASE"
+}
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index b84f7ea..dba335e 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -133,10 +133,12 @@ install_bwSuite_server "$DMSDDIR"
install_taskmanager "$TASKMANDIR"
-unpack_tar_gz "$BASEDIR/static_files/openslx.tar.gz" "-C $OPENSLXDIR" # $1: tar.gz-file, $2: unpacking to directory
+install_ipxe "$IPXEDIR"
+
+# $1: tar.gz-file, $2: unpacking to directory
unpack_tar_gz "$BASEDIR/static_files/slx-admin.tar.gz" "-C $WWWDIR/slx-admin"
unpack_tar_gz "$BASEDIR/static_files/openslx_tftp.tar.gz" "-C $TFTPDIR"
-unpack_tar_gz "$BASEDIR/static_files/syslinux4.tar.gz" "-C $TFTPDIR/v4"
+unpack_tar_gz "$BASEDIR/static_files/syslinux4.tar.gz" "-C $TFTPDIR"
unpack_tar_gz "$BASEDIR/static_files/syslinux6.tar.gz" "-C $TFTPDIR/v6"
install_ldadp "$LDADPDIR" || perror "Could not install ldadp"