fix(Installer): fix the whole installer now its finishing the installation
This commit is contained in:
@@ -1,18 +1,12 @@
|
||||
---
|
||||
efiBootLoader: "grub"
|
||||
efiBootLoader: "grub"
|
||||
|
||||
kernel: "/vmlinuz-linux"
|
||||
img: "/initramfs-linux.img"
|
||||
fallback: "/initramfs-linux-fallback.img"
|
||||
timeout: "5"
|
||||
|
||||
grubInstall: "grub-install"
|
||||
grubMkconfig: "grub-mkconfig"
|
||||
grubCfg: "/boot/grub/grub.cfg"
|
||||
grubProbe: "grub-probe"
|
||||
efiBootMgr: "efibootmgr"
|
||||
|
||||
efiDirectory: "/boot/efi"
|
||||
efiBootloaderId: "FWS"
|
||||
grubInstall: "grub-install"
|
||||
grubMkconfig: "grub-mkconfig"
|
||||
grubCfg: "/boot/grub/grub.cfg"
|
||||
grubProbe: "grub-probe"
|
||||
efiBootMgr: "efibootmgr"
|
||||
|
||||
efiBootloaderId: "FWS"
|
||||
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
|
||||
|
||||
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.
|
||||
modules: []
|
||||
binaries: []
|
||||
files: []
|
||||
# Calamares 3.3+ : initcpiocfg modifie le mkinitcpio.conf existant
|
||||
# au lieu de le réécrire entièrement.
|
||||
|
||||
useSystemdHook: false
|
||||
|
||||
hooks:
|
||||
- base
|
||||
- udev
|
||||
- autodetect
|
||||
- microcode
|
||||
- modconf
|
||||
- kms
|
||||
- keyboard
|
||||
- keymap
|
||||
- consolefont
|
||||
- block
|
||||
- filesystems
|
||||
- fsck
|
||||
prepend: []
|
||||
append: []
|
||||
remove: []
|
||||
|
||||
@@ -8,7 +8,7 @@ extraMounts:
|
||||
mountPoint: /sys
|
||||
- device: /dev
|
||||
mountPoint: /dev
|
||||
options: [bind]
|
||||
options: [ bind ]
|
||||
- device: /dev/pts
|
||||
fs: devpts
|
||||
mountPoint: /dev/pts
|
||||
@@ -17,9 +17,29 @@ extraMounts:
|
||||
mountPoint: /run
|
||||
- device: /run/udev
|
||||
mountPoint: /run/udev
|
||||
options: [bind]
|
||||
|
||||
extraMountsEfi:
|
||||
options: [ bind ]
|
||||
- device: efivarfs
|
||||
fs: efivarfs
|
||||
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
|
||||
# l'ISO live (installeur + outils archiso). Les paquets utiles sont déjà
|
||||
# présents sur le système cible parce qu'unpackfs a copié tout le live.
|
||||
# Étape post-unpackfs : retire les paquets live-only.
|
||||
# Tous les paquets utiles sont déjà dans le squashfs.
|
||||
# Pas besoin d'installer quoi que ce soit depuis internet.
|
||||
|
||||
backend: pacman
|
||||
update_db: false
|
||||
@@ -11,6 +11,4 @@ operations:
|
||||
- remove:
|
||||
- calamares
|
||||
- kpmcore
|
||||
- archinstall
|
||||
- livecd-sounds
|
||||
- mkinitcpio-archiso
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
---
|
||||
services:
|
||||
- name: NetworkManager
|
||||
units:
|
||||
- name: "NetworkManager.service"
|
||||
action: "enable"
|
||||
mandatory: true
|
||||
|
||||
- name: systemd-resolved
|
||||
mandatory: true
|
||||
|
||||
- name: systemd-timesyncd
|
||||
mandatory: true
|
||||
|
||||
- name: sshd
|
||||
- name: "systemd-resolved.service"
|
||||
action: "enable"
|
||||
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
|
||||
allowWeakPasswordsDefault: false
|
||||
|
||||
hostname:
|
||||
location: EtcFile
|
||||
writeHostsFile: true
|
||||
setSystemdHostname: true
|
||||
|
||||
@@ -23,14 +23,14 @@ sequence:
|
||||
- keyboard
|
||||
- localecfg
|
||||
- users
|
||||
- hostname
|
||||
- hwclock
|
||||
- networkcfg
|
||||
- packages
|
||||
- shellprocess
|
||||
- initcpiocfg
|
||||
- initcpio
|
||||
- grubcfg
|
||||
- bootloader
|
||||
- packages
|
||||
- services-systemd
|
||||
- umount
|
||||
- show:
|
||||
|
||||
@@ -26,6 +26,7 @@ memtest86+
|
||||
memtest86+-efi
|
||||
|
||||
# --- Filesystems ---
|
||||
squashfs-tools
|
||||
btrfs-progs
|
||||
e2fsprogs
|
||||
exfatprogs
|
||||
@@ -97,7 +98,6 @@ calamares
|
||||
kpmcore
|
||||
qt5-base
|
||||
qt5-svg
|
||||
qt5-webengine
|
||||
qt6-base
|
||||
|
||||
# --- Agents VM (pratique pour tester l'ISO) ---
|
||||
|
||||
@@ -1,24 +1,10 @@
|
||||
# ============================================================
|
||||
# FWS Linux — modules/initcpiocfg.conf
|
||||
# Configure /etc/mkinitcpio.conf sur le système cible
|
||||
# ============================================================
|
||||
---
|
||||
# Calamares 3.3+ : initcpiocfg modifie le mkinitcpio.conf existant
|
||||
# au lieu de le réécrire entièrement.
|
||||
|
||||
# Modules à inclure dans le initramfs
|
||||
modules: []
|
||||
useSystemdHook: false
|
||||
|
||||
# Binaires supplémentaires
|
||||
binaries: []
|
||||
|
||||
# Fichiers supplémentaires
|
||||
files: []
|
||||
|
||||
# Hooks — ordre important !
|
||||
hooks:
|
||||
- base
|
||||
- udev
|
||||
- autodetect
|
||||
- modconf
|
||||
- block
|
||||
- filesystems
|
||||
- keyboard
|
||||
- fsck
|
||||
prepend: []
|
||||
append: []
|
||||
remove: []
|
||||
|
||||
@@ -26,6 +26,7 @@ memtest86+
|
||||
memtest86+-efi
|
||||
|
||||
# --- Filesystems ---
|
||||
squashfs-tools
|
||||
btrfs-progs
|
||||
e2fsprogs
|
||||
exfatprogs
|
||||
@@ -97,7 +98,6 @@ calamares
|
||||
kpmcore
|
||||
qt5-base
|
||||
qt5-svg
|
||||
qt5-webengine
|
||||
qt6-base
|
||||
|
||||
# --- Agents VM (pratique pour tester l'ISO) ---
|
||||
|
||||
Reference in New Issue
Block a user