Merge: Volume-ID-Feature (anderer Session-Strang) + device_fingerprint-Lokalablage zusammenführen
This commit is contained in:
commit
18738be01d
@ -13,7 +13,7 @@ set -euo pipefail
|
|||||||
# interaktiven Kiosk-Startseite.
|
# interaktiven Kiosk-Startseite.
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
echo "Usage: $0 <source.iso> <output.iso> <activation_code> [wifi_ssid] [wifi_psk]" >&2
|
echo "Usage: $0 <source.iso> <output.iso> <activation_code> [wifi_ssid] [wifi_psk] [volid]" >&2
|
||||||
}
|
}
|
||||||
|
|
||||||
SOURCE_ISO="${1:-}"
|
SOURCE_ISO="${1:-}"
|
||||||
@ -21,6 +21,12 @@ OUTPUT_ISO="${2:-}"
|
|||||||
ACTIVATION_CODE="${3:-}"
|
ACTIVATION_CODE="${3:-}"
|
||||||
WIFI_SSID="${4:-}"
|
WIFI_SSID="${4:-}"
|
||||||
WIFI_PSK="${5:-}"
|
WIFI_PSK="${5:-}"
|
||||||
|
# Vom Aufrufer (provisioning-server, compute_iso_volid()) bereits
|
||||||
|
# ISO9660-konform aufbereitet (Grossbuchstaben/Ziffern/Unterstrich, <=32
|
||||||
|
# Zeichen) - dieses Skript validiert/sanitisiert das bewusst nicht nochmal,
|
||||||
|
# um die Sanitisierungslogik nicht doppelt zu pflegen. Fallback nur fuer
|
||||||
|
# Aufrufe ohne sechsten Parameter (z.B. manuelle Tests).
|
||||||
|
VOLID="${6:-TUXFLOTTE}"
|
||||||
|
|
||||||
REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
WORK_DIR="$(mktemp -d)"
|
WORK_DIR="$(mktemp -d)"
|
||||||
@ -97,7 +103,7 @@ xorriso \
|
|||||||
-indev "${SOURCE_ISO}" \
|
-indev "${SOURCE_ISO}" \
|
||||||
-outdev "${OUTPUT_ISO}" \
|
-outdev "${OUTPUT_ISO}" \
|
||||||
-compliance no_emul_toc \
|
-compliance no_emul_toc \
|
||||||
-volid TUXFLOTTE \
|
-volid "${VOLID}" \
|
||||||
-map "${REPO_DIR}/grub/mint-boot-grub.cfg" /boot/grub/grub.cfg \
|
-map "${REPO_DIR}/grub/mint-boot-grub.cfg" /boot/grub/grub.cfg \
|
||||||
-map "${REPO_DIR}/grub/mint-isolinux-live.cfg" /isolinux/live.cfg \
|
-map "${REPO_DIR}/grub/mint-isolinux-live.cfg" /isolinux/live.cfg \
|
||||||
-map "${custom_initrd}" /casper/initrd.lz \
|
-map "${custom_initrd}" /casper/initrd.lz \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user