fix(Installer): fix the whole installer now its finishing the installation
This commit is contained in:
@@ -83,6 +83,8 @@ find /tmp/fws-build/releng -type f -exec dos2unix {} + 2>/dev/null
|
|||||||
|
|
||||||
echo "==> Lancement de mkarchiso..."
|
echo "==> Lancement de mkarchiso..."
|
||||||
mkdir -p "\$WORK_DIR/out"
|
mkdir -p "\$WORK_DIR/out"
|
||||||
|
chmod -f 777 "\$WORK_DIR/out/"FWS-*.iso 2>/dev/null || true
|
||||||
|
rm -f "\$WORK_DIR/out/"FWS-*.iso 2>/dev/null || true
|
||||||
mkarchiso -v -w /tmp/fws-build/work -o "\$WORK_DIR/out" /tmp/fws-build/releng
|
mkarchiso -v -w /tmp/fws-build/work -o "\$WORK_DIR/out" /tmp/fws-build/releng
|
||||||
|
|
||||||
echo "==> Nettoyage..."
|
echo "==> Nettoyage..."
|
||||||
@@ -149,6 +151,8 @@ else
|
|||||||
|
|
||||||
echo "==> Lancement de mkarchiso..."
|
echo "==> Lancement de mkarchiso..."
|
||||||
mkdir -p "$WORK_DIR/out"
|
mkdir -p "$WORK_DIR/out"
|
||||||
|
chmod -f 777 "$WORK_DIR/out/"FWS-*.iso 2>/dev/null || true
|
||||||
|
rm -f "$WORK_DIR/out/"FWS-*.iso 2>/dev/null || true
|
||||||
mkarchiso -v -w /tmp/fws-build/work -o "$WORK_DIR/out" /tmp/fws-build/releng
|
mkarchiso -v -w /tmp/fws-build/work -o "$WORK_DIR/out" /tmp/fws-build/releng
|
||||||
|
|
||||||
echo "==> Nettoyage..."
|
echo "==> Nettoyage..."
|
||||||
|
|||||||
@@ -1,18 +1,12 @@
|
|||||||
---
|
---
|
||||||
efiBootLoader: "grub"
|
efiBootLoader: "grub"
|
||||||
|
|
||||||
kernel: "/vmlinuz-linux"
|
grubInstall: "grub-install"
|
||||||
img: "/initramfs-linux.img"
|
grubMkconfig: "grub-mkconfig"
|
||||||
fallback: "/initramfs-linux-fallback.img"
|
grubCfg: "/boot/grub/grub.cfg"
|
||||||
timeout: "5"
|
grubProbe: "grub-probe"
|
||||||
|
efiBootMgr: "efibootmgr"
|
||||||
grubInstall: "grub-install"
|
|
||||||
grubMkconfig: "grub-mkconfig"
|
|
||||||
grubCfg: "/boot/grub/grub.cfg"
|
|
||||||
grubProbe: "grub-probe"
|
|
||||||
efiBootMgr: "efibootmgr"
|
|
||||||
|
|
||||||
efiDirectory: "/boot/efi"
|
|
||||||
efiBootloaderId: "FWS"
|
|
||||||
|
|
||||||
|
efiBootloaderId: "FWS"
|
||||||
installEFIFallback: true
|
installEFIFallback: true
|
||||||
|
installHybridGRUB: false
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
---
|
---
|
||||||
mountOptions:
|
|
||||||
default: defaults,noatime
|
|
||||||
btrfs: defaults,noatime,compress=zstd,space_cache=v2
|
|
||||||
|
|
||||||
ssdExtraMountOptions:
|
|
||||||
ext4: discard
|
|
||||||
jfs: discard
|
|
||||||
xfs: discard
|
|
||||||
swap: discard
|
|
||||||
btrfs: discard=async
|
|
||||||
|
|
||||||
crypttabOptions: luks,keyscript=/bin/cat
|
crypttabOptions: luks,keyscript=/bin/cat
|
||||||
|
|
||||||
|
tmpOptions:
|
||||||
|
default:
|
||||||
|
tmpfs: false
|
||||||
|
options: ""
|
||||||
|
ssd:
|
||||||
|
tmpfs: true
|
||||||
|
options: "defaults,noatime,mode=1777"
|
||||||
|
|||||||
@@ -1,19 +1,10 @@
|
|||||||
---
|
---
|
||||||
# Hooks par défaut Arch + support clavier/LUKS avant block/filesystems.
|
# Calamares 3.3+ : initcpiocfg modifie le mkinitcpio.conf existant
|
||||||
modules: []
|
# au lieu de le réécrire entièrement.
|
||||||
binaries: []
|
|
||||||
files: []
|
useSystemdHook: false
|
||||||
|
|
||||||
hooks:
|
hooks:
|
||||||
- base
|
prepend: []
|
||||||
- udev
|
append: []
|
||||||
- autodetect
|
remove: []
|
||||||
- microcode
|
|
||||||
- modconf
|
|
||||||
- kms
|
|
||||||
- keyboard
|
|
||||||
- keymap
|
|
||||||
- consolefont
|
|
||||||
- block
|
|
||||||
- filesystems
|
|
||||||
- fsck
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ extraMounts:
|
|||||||
mountPoint: /sys
|
mountPoint: /sys
|
||||||
- device: /dev
|
- device: /dev
|
||||||
mountPoint: /dev
|
mountPoint: /dev
|
||||||
options: [bind]
|
options: [ bind ]
|
||||||
- device: /dev/pts
|
- device: /dev/pts
|
||||||
fs: devpts
|
fs: devpts
|
||||||
mountPoint: /dev/pts
|
mountPoint: /dev/pts
|
||||||
@@ -17,9 +17,29 @@ extraMounts:
|
|||||||
mountPoint: /run
|
mountPoint: /run
|
||||||
- device: /run/udev
|
- device: /run/udev
|
||||||
mountPoint: /run/udev
|
mountPoint: /run/udev
|
||||||
options: [bind]
|
options: [ bind ]
|
||||||
|
|
||||||
extraMountsEfi:
|
|
||||||
- device: efivarfs
|
- device: efivarfs
|
||||||
fs: efivarfs
|
fs: efivarfs
|
||||||
mountPoint: /sys/firmware/efi/efivars
|
mountPoint: /sys/firmware/efi/efivars
|
||||||
|
efi: true
|
||||||
|
|
||||||
|
mountOptions:
|
||||||
|
- filesystem: default
|
||||||
|
options: [ defaults, noatime ]
|
||||||
|
- filesystem: efi
|
||||||
|
options: [ defaults, umask=0077 ]
|
||||||
|
- filesystem: ext4
|
||||||
|
ssdOptions: [ discard ]
|
||||||
|
- filesystem: xfs
|
||||||
|
ssdOptions: [ discard ]
|
||||||
|
- filesystem: btrfs
|
||||||
|
options: [ defaults, noatime, "compress=zstd:1", "space_cache=v2" ]
|
||||||
|
ssdOptions: [ discard=async ]
|
||||||
|
hddOptions: [ autodefrag ]
|
||||||
|
- filesystem: btrfs_swap
|
||||||
|
options: [ defaults, noatime ]
|
||||||
|
- filesystem: f2fs
|
||||||
|
options: [ defaults, noatime ]
|
||||||
|
ssdOptions: [ discard ]
|
||||||
|
- filesystem: swap
|
||||||
|
ssdOptions: [ discard ]
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
# Étape post-unpackfs : on retire les paquets qui ne servent que dans
|
# Étape post-unpackfs : retire les paquets live-only.
|
||||||
# l'ISO live (installeur + outils archiso). Les paquets utiles sont déjà
|
# Tous les paquets utiles sont déjà dans le squashfs.
|
||||||
# présents sur le système cible parce qu'unpackfs a copié tout le live.
|
# Pas besoin d'installer quoi que ce soit depuis internet.
|
||||||
|
|
||||||
backend: pacman
|
backend: pacman
|
||||||
update_db: false
|
update_db: false
|
||||||
@@ -11,6 +11,4 @@ operations:
|
|||||||
- remove:
|
- remove:
|
||||||
- calamares
|
- calamares
|
||||||
- kpmcore
|
- kpmcore
|
||||||
- archinstall
|
|
||||||
- livecd-sounds
|
|
||||||
- mkinitcpio-archiso
|
- mkinitcpio-archiso
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
---
|
---
|
||||||
services:
|
units:
|
||||||
- name: NetworkManager
|
- name: "NetworkManager.service"
|
||||||
|
action: "enable"
|
||||||
mandatory: true
|
mandatory: true
|
||||||
|
|
||||||
- name: systemd-resolved
|
- name: "systemd-resolved.service"
|
||||||
mandatory: true
|
action: "enable"
|
||||||
|
|
||||||
- name: systemd-timesyncd
|
|
||||||
mandatory: true
|
|
||||||
|
|
||||||
- name: sshd
|
|
||||||
mandatory: false
|
mandatory: false
|
||||||
|
|
||||||
targets: []
|
- name: "systemd-timesyncd.service"
|
||||||
|
action: "enable"
|
||||||
|
mandatory: false
|
||||||
|
|
||||||
|
- name: "sshd.service"
|
||||||
|
action: "enable"
|
||||||
|
mandatory: false
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
---
|
||||||
|
# Exécuté HORS chroot (live system) pour accéder à l'ISO montée.
|
||||||
|
# But : restaurer le kernel (retiré du squashfs par mkarchiso) et
|
||||||
|
# corriger les fichiers mkinitcpio archiso-spécifiques.
|
||||||
|
|
||||||
|
dontChroot: true
|
||||||
|
|
||||||
|
script:
|
||||||
|
# Copie le kernel depuis l'ISO vers /boot du système cible
|
||||||
|
- 'cp "$(find /run/archiso/bootmnt -name vmlinuz-linux 2>/dev/null | head -1)" "${ROOT}/boot/vmlinuz-linux"'
|
||||||
|
|
||||||
|
# Supprime le drop-in archiso (surcharge HOOKS avec des hooks inexistants post-install)
|
||||||
|
- '-rm -f "${ROOT}/etc/mkinitcpio.conf.d/archiso.conf"'
|
||||||
|
|
||||||
|
# Remplace le linux.preset archiso par le preset standard (default + fallback)
|
||||||
|
# \x27 = ' et \x22 = " pour éviter les conflits de quotes dans YAML/bash
|
||||||
|
- 'printf "PRESETS=(\x27default\x27 \x27fallback\x27)\nALL_kver=\x22/boot/vmlinuz-linux\x22\nALL_config=\x22/etc/mkinitcpio.conf\x22\nALL_microcode=(/boot/*-ucode.img)\ndefault_image=\x22/boot/initramfs-linux.img\x22\nfallback_image=\x22/boot/initramfs-linux-fallback.img\x22\nfallback_options=\x22-S autodetect\x22\n" > "${ROOT}/etc/mkinitcpio.d/linux.preset"'
|
||||||
@@ -22,3 +22,8 @@ passwordRequirements:
|
|||||||
|
|
||||||
allowWeakPasswords: false
|
allowWeakPasswords: false
|
||||||
allowWeakPasswordsDefault: false
|
allowWeakPasswordsDefault: false
|
||||||
|
|
||||||
|
hostname:
|
||||||
|
location: EtcFile
|
||||||
|
writeHostsFile: true
|
||||||
|
setSystemdHostname: true
|
||||||
|
|||||||
@@ -23,14 +23,14 @@ sequence:
|
|||||||
- keyboard
|
- keyboard
|
||||||
- localecfg
|
- localecfg
|
||||||
- users
|
- users
|
||||||
- hostname
|
|
||||||
- hwclock
|
- hwclock
|
||||||
- networkcfg
|
- networkcfg
|
||||||
|
- packages
|
||||||
|
- shellprocess
|
||||||
- initcpiocfg
|
- initcpiocfg
|
||||||
- initcpio
|
- initcpio
|
||||||
- grubcfg
|
- grubcfg
|
||||||
- bootloader
|
- bootloader
|
||||||
- packages
|
|
||||||
- services-systemd
|
- services-systemd
|
||||||
- umount
|
- umount
|
||||||
- show:
|
- show:
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ memtest86+
|
|||||||
memtest86+-efi
|
memtest86+-efi
|
||||||
|
|
||||||
# --- Filesystems ---
|
# --- Filesystems ---
|
||||||
|
squashfs-tools
|
||||||
btrfs-progs
|
btrfs-progs
|
||||||
e2fsprogs
|
e2fsprogs
|
||||||
exfatprogs
|
exfatprogs
|
||||||
@@ -97,7 +98,6 @@ calamares
|
|||||||
kpmcore
|
kpmcore
|
||||||
qt5-base
|
qt5-base
|
||||||
qt5-svg
|
qt5-svg
|
||||||
qt5-webengine
|
|
||||||
qt6-base
|
qt6-base
|
||||||
|
|
||||||
# --- Agents VM (pratique pour tester l'ISO) ---
|
# --- Agents VM (pratique pour tester l'ISO) ---
|
||||||
|
|||||||
@@ -1,24 +1,10 @@
|
|||||||
# ============================================================
|
---
|
||||||
# FWS Linux — modules/initcpiocfg.conf
|
# Calamares 3.3+ : initcpiocfg modifie le mkinitcpio.conf existant
|
||||||
# Configure /etc/mkinitcpio.conf sur le système cible
|
# au lieu de le réécrire entièrement.
|
||||||
# ============================================================
|
|
||||||
|
|
||||||
# Modules à inclure dans le initramfs
|
useSystemdHook: false
|
||||||
modules: []
|
|
||||||
|
|
||||||
# Binaires supplémentaires
|
|
||||||
binaries: []
|
|
||||||
|
|
||||||
# Fichiers supplémentaires
|
|
||||||
files: []
|
|
||||||
|
|
||||||
# Hooks — ordre important !
|
|
||||||
hooks:
|
hooks:
|
||||||
- base
|
prepend: []
|
||||||
- udev
|
append: []
|
||||||
- autodetect
|
remove: []
|
||||||
- modconf
|
|
||||||
- block
|
|
||||||
- filesystems
|
|
||||||
- keyboard
|
|
||||||
- fsck
|
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ memtest86+
|
|||||||
memtest86+-efi
|
memtest86+-efi
|
||||||
|
|
||||||
# --- Filesystems ---
|
# --- Filesystems ---
|
||||||
|
squashfs-tools
|
||||||
btrfs-progs
|
btrfs-progs
|
||||||
e2fsprogs
|
e2fsprogs
|
||||||
exfatprogs
|
exfatprogs
|
||||||
@@ -97,7 +98,6 @@ calamares
|
|||||||
kpmcore
|
kpmcore
|
||||||
qt5-base
|
qt5-base
|
||||||
qt5-svg
|
qt5-svg
|
||||||
qt5-webengine
|
|
||||||
qt6-base
|
qt6-base
|
||||||
|
|
||||||
# --- Agents VM (pratique pour tester l'ISO) ---
|
# --- Agents VM (pratique pour tester l'ISO) ---
|
||||||
|
|||||||
@@ -58,6 +58,41 @@ LOCAL_REPO="$SCRIPT_DIR/local-repo"
|
|||||||
BUILD_DIR="/tmp/fws-aur-build"
|
BUILD_DIR="/tmp/fws-aur-build"
|
||||||
BUILD_USER="fwsbuild"
|
BUILD_USER="fwsbuild"
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
step "0/4 — Préparation pacman (sandbox WSL + keyring)"
|
||||||
|
# ============================================================
|
||||||
|
# pacman ≥ 7 utilise landlock pour sandboxer les ops fs.
|
||||||
|
# Le kernel WSL ne supporte pas landlock → désactivation explicite.
|
||||||
|
if grep -qi 'microsoft\|wsl' /proc/version 2>/dev/null; then
|
||||||
|
if ! grep -qE '^[[:space:]]*DisableSandbox' /etc/pacman.conf; then
|
||||||
|
sed -i '/^\[options\]/a DisableSandbox' /etc/pacman.conf
|
||||||
|
warn "WSL détecté → DisableSandbox ajouté à /etc/pacman.conf"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Keyring : sur une WSL Arch ancienne, archlinux-keyring est périmé et
|
||||||
|
# bloque tout install ("unknown trust"). On bypass SigLevel uniquement
|
||||||
|
# pour mettre à jour le paquet keyring, puis on rétablit.
|
||||||
|
info "Refresh du trousseau pacman…"
|
||||||
|
pacman-key --init 2>/dev/null || true
|
||||||
|
|
||||||
|
if [ -f /etc/pacman.conf ] && ! grep -qE '^[[:space:]]*SigLevel[[:space:]]*=[[:space:]]*Never' /etc/pacman.conf; then
|
||||||
|
cp -f /etc/pacman.conf /etc/pacman.conf.fws.bak
|
||||||
|
sed -i 's/^SigLevel.*/SigLevel = Never/' /etc/pacman.conf
|
||||||
|
pacman -Sy --noconfirm --needed archlinux-keyring \
|
||||||
|
|| warn "Maj archlinux-keyring échouée (sigs bypass) — on continue"
|
||||||
|
mv -f /etc/pacman.conf.fws.bak /etc/pacman.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
pacman-key --populate archlinux 2>/dev/null || true
|
||||||
|
|
||||||
|
# Maj système complète : indispensable pour gérer les "package splits"
|
||||||
|
# (ex. gcc-libs → libgcc + libstdc++) sinon makepkg plantera sur
|
||||||
|
# "conflicting files" lors de l'install des dépendances.
|
||||||
|
info "Mise à jour complète du système (peut être long la première fois)…"
|
||||||
|
pacman -Syu --noconfirm \
|
||||||
|
|| warn "pacman -Syu a partiellement échoué — on continue"
|
||||||
|
|
||||||
# ============================================================
|
# ============================================================
|
||||||
step "1/4 — Outils de build"
|
step "1/4 — Outils de build"
|
||||||
# ============================================================
|
# ============================================================
|
||||||
|
|||||||
Reference in New Issue
Block a user