[demo server] update scripts to support ntp setup

1 files changed, 45 insertions, 2 deletions

diff --git a/data/openslx-update b/data/openslx-update
index 4f8da0f5..06d05554 100644..100755
--- a/data/openslx-update
+++ b/data/openslx-update
@@ -20,6 +20,9 @@ MIRROR="http://mltk.boot.openslx.org"
 REMOTEINDEX="/tmp/mlversion"
 LOCALINDEX="/opt/openslx/local_version"
 WWWTEMP="/srv/openslx/www-temp"
+PXECONFIG="/srv/openslx/tftp/pxelinux.cfg/default"
+
+. "/opt/openslx/server-defaults" || error "Konnte Serverkonfiguration nicht laden. Wurde openslx-install ausgeführt?"
 
 LOCAL_STABLE=0
 LOCAL_TESTING=0
@@ -33,22 +36,62 @@ rm -f "$REMOTEINDEX"
 wget -O "$REMOTEINDEX" "$MIRROR/index" || error "Konnte Liste verfügbarer Releases nicht herunterladen."
 . "$REMOTEINDEX" || error "Liste verfügbarer Releases Fehlerhaft (konnte $REMOTEINDEX nicht sourcen)"
 
+# Regenerate pxemenu
+mkdir -p "/srv/openslx/tftp/pxelinux.cfg"
+cp "/opt/openslx/templates/pxemenu-header" "$PXECONFIG"
+
 mkdir -p "$WWWTEMP"
 mv /srv/openslx/www/openslx-* "$WWWTEMP/"
 for REL in ${!AVAILABLE_*}; do
 	BRANCH="${REL#AVAILABLE_}"
 	print "Remote has branch $BRANCH"
 	PXELINE=""
+	KERNEL=""
 	for FILE in ${!REL}; do
-		PXELINE="$PXELINE http://"
+		# Handle pxelinux.cfg
+		if [[ "$FILE" == kernel* ]]; then
+			KERNEL="KERNEL http://$SLX_LOCAL_ADDR/openslx-$FILE"
+		else
+			if [ -z "$PXELINE" ]; then
+				PXELINE="INITRD "
+			else
+				PXELINE+=","
+			fi
+			PXELINE+="http://$SLX_LOCAL_ADDR/openslx-$FILE"
+		fi
+		# If file is available locally, don't download again
 		if [ -s "$WWWTEMP/openslx-$FILE" ]; then
 			mv "$WWWTEMP/openslx-$FILE" "/srv/openslx/www/"
 			continue
 		fi
-		wget -O "$WWWTEMP/openslx-$FILE" "$MIRROR/files/$FILE" || warning "Could not download $FILE"
+		# Download
+		wget -O "/srv/openslx/www/openslx-$FILE" "$MIRROR/files/$FILE" || warning "Could not download $FILE"
 	done
+	if [ -z "$PXELINE" -o -z "$KERNEL" ]; then
+		warning "Incomplete entry. KERNEL or INITRD missing."
+		continue
+	fi
+	# Append to pxeconfig
+	echo "# Branch $BRANCH" >> "$PXECONFIG"
+	echo "LABEL $BRANCH" >> "$PXECONFIG"
+	echo "    MENU LABEL OpenSLX-NG $BRANCH [${!REL}]" >> "$PXECONFIG"
+	echo "    $KERNEL" >> "$PXECONFIG"
+	echo "    $PXELINE" >> "$PXECONFIG"
+	echo "    IPAPPEND 3" >> "$PXECONFIG"
+	echo "    APPEND slxconfig=http://$SLX_LOCAL_ADDR/config" >> "$PXECONFIG"
+	# Extra files (e.g. vmplayer in it's own sqfs that gets downloaded later)
 	EXTRA="${BRANCH}_EXTRA"
 	for FILE in ${!EXTRA}; do
+		# If file is available locally, don't download again
+		if [ -s "$WWWTEMP/openslx-$FILE" ]; then
+			mv "$WWWTEMP/openslx-$FILE" "/srv/openslx/www/"
+			continue
+		fi
+		# Download
+		wget -O "/srv/openslx/www/openslx-$FILE" "$MIRROR/files/$FILE" || warning "Could not download $FILE"
 	done
 done
+print "Done."
+print "Old files left over:"
+ls -alh "$WWWTEMP"