grub/EFI-BOOT-grub.cfg

@@ -26,12 +26,12 @@ set color_highlight=white/blue
 
 ### BEGIN /etc/grub.d/10_linux ###
 menuentry 'Tuxflotte Provisioning (automatisch)' --class fedora --class gnu-linux --class gnu --class os {
-	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=auto
+	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image tuxflotte.mode=auto
 	initrd /boot/x86_64/loader/initrd
 }
 
 menuentry 'Tuxflotte Provisioning (interaktiv)' --class fedora --class gnu-linux --class gnu --class os {
-	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=interactive
+	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image tuxflotte.mode=interactive
 	initrd /boot/x86_64/loader/initrd
 }
 

grub/boot-grub2-grub.cfg

@@ -23,12 +23,12 @@ set color_highlight=white/blue
 
 ### BEGIN /etc/grub.d/10_linux ###
 menuentry 'Tuxflotte Provisioning (automatisch)' --class fedora --class gnu-linux --class gnu --class os {
-	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=auto
+	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image tuxflotte.mode=auto
 	initrd /boot/x86_64/loader/initrd
 }
 
 menuentry 'Tuxflotte Provisioning (interaktiv)' --class fedora --class gnu-linux --class gnu --class os {
-	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=interactive
+	linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image tuxflotte.mode=interactive
 	initrd /boot/x86_64/loader/initrd
 }
 

live-updates/etc/sudoers.d/90-tuxflotte

@@ -1 +0,0 @@
-liveuser ALL=(ALL) NOPASSWD: ALL

live-updates/etc/xdg/autostart/tuxflotte-installer.desktop

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Tuxflotte Provisioning
-Exec=gnome-terminal --title="Tuxflotte Provisioning" -- bash -c 'sudo /opt/tuxflotte/scripts/installer.sh; rc=$?; echo; echo "--- installer.sh beendet (Exit-Code: $rc) ---"; exec bash'
-X-GNOME-Autostart-enabled=true
-NoDisplay=true

scripts/build.sh

@@ -64,22 +64,6 @@ verify_workdir() {
   echo "GRUB verification passed."
 }
 
-prepare_updates() {
-  echo "Assembling live-updates payload..."
-
-  local updates_dir="$WORK_DIR/updates"
-
-  rm -rf "$updates_dir"
-  mkdir -p "$updates_dir/opt/tuxflotte"
-
-  cp -a "$REPO_DIR/live-updates/etc" "$updates_dir/"
-  cp -a "$REPO_DIR/scripts" "$updates_dir/opt/tuxflotte/"
-  cp -a "$REPO_DIR/backends" "$updates_dir/opt/tuxflotte/"
-  cp -a "$REPO_DIR/config" "$updates_dir/opt/tuxflotte/"
-
-  chmod 0440 "$updates_dir/etc/sudoers.d/90-tuxflotte"
-}
-
 create_iso() {
   echo "Creating Tuxflotte ISO..."
 
@@ -93,9 +77,6 @@ create_iso() {
     -compliance no_emul_toc \
     -map "$REPO_DIR/grub/EFI-BOOT-grub.cfg" /EFI/BOOT/grub.cfg \
     -map "$REPO_DIR/grub/boot-grub2-grub.cfg" /boot/grub2/grub.cfg \
-    -map "$WORK_DIR/updates" /updates \
-    -chown_r 0 /updates -- \
-    -chgrp_r 0 /updates -- \
     -boot_image any replay
 
   echo "ISO created: $output_iso"
@@ -108,7 +89,6 @@ main() {
   extract_iso
   patch_grub
   verify_workdir
-  prepare_updates
   create_iso
 
   echo

scripts/modules/05_network.sh

@@ -440,7 +440,7 @@ export_connection_profile() {
         "${NMCLI}" \
             --get-values connection.filename \
             connection show "${connection_name}" 2>/dev/null |
-            head -n 1 || true
+            head -n 1
     )"
 
     if [[ -z "${source_file}" || ! -f "${source_file}" ]]; then

scripts/modules/20_storage.sh

@@ -1,37 +1,14 @@
 #!/usr/bin/env bash
-set -Eeuo pipefail
 
-SCRIPT_NAME="$(basename "${BASH_SOURCE[0]}")"
+log_info "Datenträger werden erkannt..."
-readonly SCRIPT_NAME
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DISKS="$(list_install_disks || true)"
-readonly SCRIPT_DIR
 
-# shellcheck source=../lib/checks.sh
+if [[ -z "$DISKS" ]]; then
-source "${SCRIPT_DIR}/../lib/checks.sh"
+  error_exit "Keine geeigneten Datenträger erkannt."
+fi
 
-log() {
+echo "$DISKS"
-    printf '[%s] %s\n' "${SCRIPT_NAME}" "$*"
-}
 
-fatal() {
+log_warn "Phase 1: Datenträger werden nur angezeigt, nicht verändert."
-    printf '[%s] FEHLER: %s\n' "${SCRIPT_NAME}" "$*" >&2
+log_warn "Partitionierung ist noch deaktiviert."
-    exit 1
-}
-
-main() {
-    log "Datenträger werden erkannt..."
-
-    local disks
-    disks="$(list_install_disks || true)"
-
-    [[ -n "${disks}" ]] ||
-        fatal "Keine geeigneten Datenträger erkannt."
-
-    printf '%s\n' "${disks}"
-
-    log "Phase 1: Datenträger werden nur angezeigt, nicht verändert."
-    log "Partitionierung ist noch deaktiviert."
-}
-
-main "$@"