fix(Multi-Desktop Hyperland): Fix some bugs of hyperland
This commit is contained in:
@@ -1,8 +0,0 @@
|
||||
---
|
||||
# Minimal Calamares view module config for desktop selection
|
||||
# This tells Calamares to use our QML page from the branding folder.
|
||||
module: view
|
||||
name: desktop
|
||||
qml: "branding/fws/desktop.qml"
|
||||
title: "Choix de l'environnement"
|
||||
description: "Sélectionne le bureau à installer"
|
||||
@@ -0,0 +1,26 @@
|
||||
---
|
||||
mode: required
|
||||
|
||||
labels:
|
||||
step: "Environnement de bureau"
|
||||
|
||||
items:
|
||||
- id: xfce
|
||||
name: "Xfce"
|
||||
description: "Environnement léger, stable et rapide. Idéal pour les machines modestes."
|
||||
screenshot: ""
|
||||
|
||||
- id: kde
|
||||
name: "KDE Plasma"
|
||||
description: "Environnement moderne et très personnalisable avec de nombreuses fonctionnalités."
|
||||
screenshot: ""
|
||||
|
||||
- id: gnome
|
||||
name: "GNOME"
|
||||
description: "Environnement épuré et intuitif avec une interface tactile-friendly."
|
||||
screenshot: ""
|
||||
|
||||
- id: hyprland
|
||||
name: "Hyprland"
|
||||
description: "Compositeur Wayland dynamique, animé et hautement personnalisable."
|
||||
screenshot: ""
|
||||
@@ -8,10 +8,7 @@ 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"'
|
||||
- 'DESKTOP="$(cat /run/fws-desktop 2>/dev/null || printf xfce)"'
|
||||
- 'if [ -z "$DESKTOP" ]; then DESKTOP="xfce"; fi'
|
||||
- 'if [ ! -f "${ROOT}/usr/local/bin/fws-desktop-init-$DESKTOP" ]; then echo "Script bureau introuvable: $DESKTOP" >&2; exit 1; fi'
|
||||
- 'chroot "${ROOT}" /bin/bash "/usr/local/bin/fws-desktop-init-$DESKTOP"'
|
||||
- 'chroot "${ROOT}" /bin/bash "/usr/local/bin/fws-desktop-init-$(cat /run/fws-desktop 2>/dev/null || printf xfce)"'
|
||||
|
||||
# Supprime le drop-in archiso (surcharge HOOKS avec des hooks inexistants post-install)
|
||||
- 'rm -f "${ROOT}/etc/mkinitcpio.conf.d/archiso.conf"'
|
||||
|
||||
@@ -12,7 +12,7 @@ sequence:
|
||||
- keyboard
|
||||
- partition
|
||||
- users
|
||||
- desktop
|
||||
- packagechooser
|
||||
- summary
|
||||
- exec:
|
||||
- partition
|
||||
@@ -27,6 +27,7 @@ sequence:
|
||||
- hwclock
|
||||
- networkcfg
|
||||
- packages
|
||||
- fws-desktop-choice
|
||||
- shellprocess
|
||||
- initcpiocfg
|
||||
- initcpio
|
||||
|
||||
Reference in New Issue
Block a user