summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Rößler2018-05-07 17:04:39 +0200
committerChristian Rößler2018-05-07 17:04:39 +0200
commitf0b8cc7d0288f7425adc7bbc183d93d2621fd69f (patch)
treebfee306ab9b363ea81db9d6d7d6cbfd6a43b983e
parent[SSPS] Some unneeded stuff deleted (diff)
downloadsetup-scripts-f0b8cc7d0288f7425adc7bbc183d93d2621fd69f.tar.gz
setup-scripts-f0b8cc7d0288f7425adc7bbc183d93d2621fd69f.tar.xz
setup-scripts-f0b8cc7d0288f7425adc7bbc183d93d2621fd69f.zip
[SSPS] Leetle bug, some ipxe message stuff
-rw-r--r--satellit_installer/includes/10-install_ipxe.inc3
-rwxr-xr-xsatellit_installer/satellit_installer2
2 files changed, 4 insertions, 1 deletions
diff --git a/satellit_installer/includes/10-install_ipxe.inc b/satellit_installer/includes/10-install_ipxe.inc
index d64c36e..2a5afd7 100644
--- a/satellit_installer/includes/10-install_ipxe.inc
+++ b/satellit_installer/includes/10-install_ipxe.inc
@@ -16,12 +16,15 @@ install_ipxe() {
compile_ipxe() {
echo "*** compiling iPXE in the background ..."
+ echo
[ -z "$1" ] && perror "Call compile_ipxe with target directory!"
cd "$1"/src
make bin/undionly.kkkpxe
+ chown -R taskmanager:www-data "$1"
if [ "$ERR" -ne 0 ]; then
pwarning "*** Background compilation of iPXE failed."
else
echo "*** Background compilation of iPXE successful."
fi
+ echo
}
diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer
index a113605..7a219bf 100755
--- a/satellit_installer/satellit_installer
+++ b/satellit_installer/satellit_installer
@@ -211,6 +211,6 @@ finalize # Cleaning script; finalize script will delete itself.
echo "Warte auf eventuelle Hintergrundprozesse."
wait
-cat /tmp/ipxesuccess && rm /tmp/ipxesuccess
+cat /tmp/ipxesuccess | tee -a /root/init.log && rm /tmp/ipxesuccess
exit 0