summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Rößler2018-05-07 15:42:08 +0200
committerChristian Rößler2018-05-07 15:42:08 +0200
commit26484cbeb8e00390766d2f4511ba53191187511c (patch)
treea705832a094f95e3468c031e056a70ff72b753a5
parent[SSPS] iPXE compilation in background added (diff)
downloadsetup-scripts-26484cbeb8e00390766d2f4511ba53191187511c.tar.gz
setup-scripts-26484cbeb8e00390766d2f4511ba53191187511c.tar.xz
setup-scripts-26484cbeb8e00390766d2f4511ba53191187511c.zip
[SSPS] Two really stoooopid bugs
-rw-r--r--satellit_installer/includes/10-install_ipxe.inc2
-rwxr-xr-xsatellit_installer/satellit_installer2
2 files changed, 2 insertions, 2 deletions
diff --git a/satellit_installer/includes/10-install_ipxe.inc b/satellit_installer/includes/10-install_ipxe.inc
index ec3878d..0205552 100644
--- a/satellit_installer/includes/10-install_ipxe.inc
+++ b/satellit_installer/includes/10-install_ipxe.inc
@@ -20,7 +20,7 @@ install_ipxe() {
compile_ipxe() {
echo "*** compiling iPXE in the background ..."
[ -z "$1" ] && perror "Call compile_ipxe with target directory!"
- cd cd "$1"/src
+ cd "$1"/src
make bin/undionly.kkkpxe
if [ "$ERR" -ne 0 ]; then
pwarning "*** Background compilation of iPXE failed."
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index 93f9c69..f4f2bfd 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -141,7 +141,7 @@ install_dnbd3-server "$DNBD3DIR"
install_taskmanager "$TASKMANDIR"
install_ipxe "$IPXEDIR"
-compile_ipxe &> /tmp/ipxesuccess &
+compile_ipxe "$IPXEDIR" &>/tmp/ipxesuccess &
# $1: tar.gz-file, $2: unpacking to directory
unpack_tar_gz "$BASEDIR/static_files/slx-admin.tar.gz" "-C $WWWDIR/slx-admin"