This commit is contained in:
Valeria Fadeeva 2025-01-06 16:33:50 +05:00
parent 3febdcca82
commit 7b39f4778b
3 changed files with 24 additions and 29 deletions

View File

@ -1,29 +1,33 @@
# SPDX-FileCopyrightText: no # SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
# #
# Configuration file for Melawy Linux Calamares online installs # Configuration file for Melawy Linux offline installs
--- ---
modules-search: [ local ] modules-search: [ local ]
instances: instances:
- id: online - id: offline
module: packages module: packages
config: packages_online.conf config: packages_offline.conf
- id: online - id: offline
module: welcome module: welcome
config: welcome_online.conf config: welcome_offline.conf
# - shellprocess_copy_packages_dont_chroot - id: offline
- id: copy_packages_dont_chroot module: eos_bootloader
config: eos_bootloader_offline.conf
# - shellprocess@reset_systemd_multiuser_chrooted
- id: reset_systemd_multiuser_chrooted
module: shellprocess module: shellprocess
config: shellprocess_copy_packages_dont_chroot.conf config: shellprocess_reset_systemd_multiuser_chrooted.conf
# - shellprocess@initialize_pacman_dont_chroot # - shellprocess@initialize_pacman_dont_chroot
- id: initialize_pacman_dont_chroot - id: initialize_pacman_dont_chroot
module: shellprocess module: shellprocess
config: shellprocess_initialize_pacman_dont_chroot_online.conf config: shellprocess_initialize_pacman_dont_chroot_offline.conf
# - shellprocess@remove_ucode_chrooted # - shellprocess@remove_ucode_chrooted
- id: remove_ucode_chrooted - id: remove_ucode_chrooted
@ -60,11 +64,6 @@ instances:
module: shellprocess module: shellprocess
config: shellprocess_copy_install_logs_dont_chroot.conf config: shellprocess_copy_install_logs_dont_chroot.conf
# - shellprocess@install_nvidia_drivers_chrooted
- id: install_nvidia_drivers_chrooted
module: shellprocess
config: shellprocess_install_nvidia_drivers_chrooted.conf
# - shellprocess@install_intel_drivers_chrooted # - shellprocess@install_intel_drivers_chrooted
- id: install_intel_drivers_chrooted - id: install_intel_drivers_chrooted
module: shellprocess module: shellprocess
@ -73,11 +72,9 @@ instances:
sequence: sequence:
- show: - show:
- welcome@online - welcome@offline
- locale - locale
- keyboard - keyboard
# - packagechooser
- netinstall
- packagechooserq - packagechooserq
- partition - partition
- users - users
@ -85,31 +82,28 @@ sequence:
- exec: - exec:
- hardwaredetect - hardwaredetect
- partition - partition
# - zfs
- mount - mount
- shellprocess@copy_packages_dont_chroot - unpackfs
- shellprocess@initialize_pacman_dont_chroot - shellprocess@reset_systemd_multiuser_chrooted
- pacstrap
- machineid - machineid
- fstab - fstab
- locale - locale
- keyboard - keyboard
- localecfg - localecfg
# - userpkglist
- packages@online
- luksbootkeyfile - luksbootkeyfile
# - zfshostid - removeuser
- users - users
- networkcfg - networkcfg
- displaymanager - displaymanager
- shellprocess@initialize_pacman_dont_chroot
- packages@offline
- hwclock - hwclock
- shellprocess@remove_ucode_chrooted - shellprocess@remove_ucode_chrooted
- eos_bootloader - eos_bootloader@offline
- grubcfg - grubcfg
- bootloader - bootloader
- services-systemd - services-systemd
- shellprocess@copy_refind_theme_chrooted - shellprocess@copy_refind_theme_chrooted
- shellprocess@install_nvidia_drivers_chrooted
- shellprocess@install_intel_drivers_chrooted - shellprocess@install_intel_drivers_chrooted
- shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
- shellprocess@build_dracut_kernels_and_menu_chrooted - shellprocess@build_dracut_kernels_and_menu_chrooted

View File

@ -147,3 +147,4 @@ script:
- command: "-/usr/local/bin/dmcheck" - command: "-/usr/local/bin/dmcheck"
- "-rm -rf /usr/local/bin/*" - "-rm -rf /usr/local/bin/*"
- '-sed -i /etc/sddm.conf.d/kde_settings.conf -e "s/liveuser//"'

View File

@ -91,6 +91,6 @@ unpack:
- source: "/run/archiso/bootmnt/arch/x86_64/airootfs.sfs" - source: "/run/archiso/bootmnt/arch/x86_64/airootfs.sfs"
sourcefs: "squashfs" sourcefs: "squashfs"
destination: "" destination: ""
- source: "/run/archiso/bootmnt/arch/boot/x86_64/vmlinuz-linux-cachyos" # - source: "/run/archiso/bootmnt/arch/boot/x86_64/vmlinuz-linux-cachyos"
sourcefs: "file" # sourcefs: "file"
destination: "/boot/vmlinuz-linux-cachyos" # destination: "/boot/vmlinuz-linux-cachyos"