diff options
| author | Simon Rettberg | 2019-10-29 14:45:20 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-10-29 14:45:20 +0100 |
| commit | cdca05d4b56c558a4769435655351338130baf23 (patch) | |
| tree | ed7a1efd4737b75f76d4d4e6590c3426ee50da99 | |
| parent | [SSPS] Remove stray syslinux unpacking commands (diff) | |
| download | setup-scripts-cdca05d4b56c558a4769435655351338130baf23.tar.gz setup-scripts-cdca05d4b56c558a4769435655351338130baf23.tar.xz setup-scripts-cdca05d4b56c558a4769435655351338130baf23.zip | |
[SSPS] Restore legacy pxelinux support
For now this doesn't cause much hassle to support...
| -rw-r--r-- | satellit_installer/includes/00-variables.inc | 2 | ||||
| -rw-r--r-- | satellit_installer/includes/10-install_ipxe.inc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc index 19cfc1c..86ff0e1 100644 --- a/satellit_installer/includes/00-variables.inc +++ b/satellit_installer/includes/00-variables.inc @@ -36,7 +36,7 @@ PACKAGELIST_WITH_RECOMMENDS=" HTTP_BASE="http://files.bwlp.ks.uni-freiburg.de/install/" HTTP_FILES="dmsd.jar openslx_tftp.tar.gz" HTTP_FILES+=" taskmanager.tar.gz db_sat_dump.sql" -HTTP_FILES+=" slx-admin.tar.gz" +HTTP_FILES+=" slx-admin.tar.gz pxelinux.0" ### slxadmin module list: which modules from modules-available will be (symbolically) linked: SLXADMIN_MODULES="adduser backup baseconfig baseconfig_bwidm baseconfig_bwlp bootstrap_datepicker bootstrap_dialog bootstrap_timepicker" diff --git a/satellit_installer/includes/10-install_ipxe.inc b/satellit_installer/includes/10-install_ipxe.inc index f25b88f..e6a451c 100644 --- a/satellit_installer/includes/10-install_ipxe.inc +++ b/satellit_installer/includes/10-install_ipxe.inc @@ -2,6 +2,7 @@ install_ipxe() { [ -z "$1" ] && perror "Call install_ipxe with target directory!" git clone --branch openslx https://git.openslx.org/openslx-ng/ipxe.git "$1" || perror "Cloning ipxe repo failed" + cp "$BASEDIR/static_files/pxelinux.0" "$1/" || perror "Could not copy pxelinux.0 to $1" # Symlink for USB-Stick HTTP access mkdir -p "$WWWDIR" ln -s -f "$TFTPDIR" "$WWWDIR/tftp" || perror "Could not create symlink for tftp dir" @@ -11,7 +12,7 @@ compile_ipxe() { echo "*** compiling iPXE in the background ..." echo [ -z "$1" ] && perror "Call compile_ipxe with target directory!" - cd "$1"/src + cd "$1/src" make bin/undionly.kkkpxe chown -R taskmanager:www-data "$1" if [ "$ERR" -ne 0 ]; then |