fix: Custom ISO

This commit is contained in:
Kroese 2024-01-22 15:00:10 +01:00 committed by GitHub
parent e5f62bd90f
commit d0853d65cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -72,6 +72,14 @@ fi
html "$MSG" html "$MSG"
CUSTOM="custom.iso" CUSTOM="custom.iso"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.img"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.iso"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.img"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.ISO"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.IMG"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.ISO"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.IMG"
TMP="$STORAGE/tmp" TMP="$STORAGE/tmp"
if [ -f "$STORAGE/$BASE" ]; then if [ -f "$STORAGE/$BASE" ]; then
@ -95,14 +103,6 @@ mkdir -p "$TMP"
ISO="$TMP/$BASE" ISO="$TMP/$BASE"
rm -f "$ISO" rm -f "$ISO"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.img"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.iso"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.img"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.ISO"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.IMG"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.ISO"
[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.IMG"
if [ ! -f "$STORAGE/$CUSTOM" ]; then if [ ! -f "$STORAGE/$CUSTOM" ]; then
CUSTOM="" CUSTOM=""
else else
@ -330,13 +330,6 @@ genisoimage -b "$ETFS" -no-emul-boot -c "$CAT" -iso-level 4 -J -l -D -N -joliet-
# Mark ISO as prepared via magic byte # Mark ISO as prepared via magic byte
printf '\x16' | dd of=$OUT bs=1 seek=0 count=1 conv=notrunc status=none printf '\x16' | dd of=$OUT bs=1 seek=0 count=1 conv=notrunc status=none
echo "$BASE" > "$STORAGE/windows.ver"
if [ -f "$ASSET" ]; then
rm -f "$STORAGE/windows.xml"
cp "$ASSET" "$STORAGE/windows.xml"
fi
[ -n "$CUSTOM" ] && rm -f "$STORAGE/$CUSTOM" [ -n "$CUSTOM" ] && rm -f "$STORAGE/$CUSTOM"
if [ -f "$STORAGE/$BASE" ]; then if [ -f "$STORAGE/$BASE" ]; then
@ -344,6 +337,14 @@ if [ -f "$STORAGE/$BASE" ]; then
fi fi
mv "$OUT" "$STORAGE/$BASE" mv "$OUT" "$STORAGE/$BASE"
echo "$BASE" > "$STORAGE/windows.ver"
if [ -f "$ASSET" ]; then
rm -f "$STORAGE/windows.xml"
cp "$ASSET" "$STORAGE/windows.xml"
fi
rm -rf "$TMP" rm -rf "$TMP"
html "Successfully prepared image for installation..." html "Successfully prepared image for installation..."