Split setup.sh in chroot-sicheren und Desktop-Teil
setup.sh rief bisher alles in einem Skript auf, was in der Autoinstall-ISO (curtin in-target/chroot) teilweise fehlschlaegt: xfconf-query, npm, oh-my-zsh, PrusaSlicer brauchen eine laufende Desktop-Session. Neuer Aufbau: - setup-base.sh: Pakete, Configs, Locale, Services (laeuft in chroot) - setup-desktop.sh: oh-my-zsh, Claude Code, PrusaSlicer, Dotfiles, XFCE-Einstellungen (laeuft beim ersten Desktop-Login) - setup.sh: Wrapper fuer Option A (manuelles curl | bash nach Install) user-data ruft jetzt setup-base.sh in late-commands auf und richtet einen XFCE-Autostart fuer setup-desktop.sh beim ersten Login ein. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
2db0b9b36f
commit
1f530674be
5 changed files with 299 additions and 224 deletions
49
user-data
49
user-data
|
|
@ -15,39 +15,18 @@ autoinstall:
|
|||
storage:
|
||||
layout:
|
||||
name: lvm
|
||||
packages:
|
||||
- bcmwl-kernel-source
|
||||
- mbpfan
|
||||
- thermald
|
||||
- lm-sensors
|
||||
- git
|
||||
- curl
|
||||
- wget
|
||||
- zsh
|
||||
- neovim
|
||||
- stow
|
||||
- build-essential
|
||||
- python3
|
||||
- python3-pip
|
||||
- nodejs
|
||||
- npm
|
||||
- wireguard
|
||||
- wireguard-tools
|
||||
- libreoffice
|
||||
- libreoffice-l10n-de
|
||||
- thunderbird
|
||||
- thunderbird-locale-de
|
||||
- language-pack-de
|
||||
- wngerman
|
||||
- tlp
|
||||
- tlp-rdw
|
||||
- keepassxc
|
||||
- htop
|
||||
- btop
|
||||
- timeshift
|
||||
- vlc
|
||||
- bc
|
||||
late-commands:
|
||||
# setup.sh aus Forgejo ausführen — Modell als Argument übergeben (13 oder 16)
|
||||
- curtin in-target --target=/target -- bash -c 'curl -fsSL https://git.motocamp.de/rene/macbook-setup/raw/branch/main/setup.sh | bash -s -- 13'
|
||||
# Für MBP 16": oben "13" durch "16" ersetzen
|
||||
# System-Setup in chroot (Pakete, Configs, Locale, Services)
|
||||
- curtin in-target --target=/target -- bash -c 'curl -fsSL https://git.motocamp.de/rene/macbook-setup/raw/branch/main/setup-base.sh | bash -s -- 13'
|
||||
# Desktop-Setup als Firstboot-Autostart einrichten
|
||||
- curtin in-target --target=/target -- mkdir -p /home/rene/.config/autostart
|
||||
- curtin in-target --target=/target -- bash -c 'cat > /home/rene/.config/autostart/macbook-setup-desktop.desktop <<AUTOSTART
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=MacBook Setup Desktop
|
||||
Exec=bash -c "curl -fsSL https://git.motocamp.de/rene/macbook-setup/raw/branch/main/setup-desktop.sh | bash 2>&1 | tee /tmp/setup-desktop.log; exec xfce4-terminal -e \"bash -c less /tmp/setup-desktop.log\""
|
||||
Hidden=false
|
||||
X-GNOME-Autostart-enabled=true
|
||||
AUTOSTART'
|
||||
- curtin in-target --target=/target -- chown -R 1000:1000 /home/rene/.config
|
||||
# Fuer MBP 16": oben "13" durch "16" ersetzen
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue