Update

settings.conf

@@ -34,11 +34,31 @@ instances:
   module:   shellprocess
   config:   shellprocess_remove_ucode_chrooted.conf
 
+#  - shellprocess@generate_dnscrypt_cert_dont_chroot
+- id:       generate_dnscrypt_cert_dont_chroot
+  module:   shellprocess
+  config:   shellprocess_generate_dnscrypt_cert_dont_chroot.conf
+
+#  - shellprocess@copy_dnscrypt_resolv_conf_chrooted
+- id:       copy_dnscrypt_resolv_conf_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
+
+#  - shellprocess@copy_dnscrypt_blocklist_chrooted
+- id:       copy_dnscrypt_blocklist_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
+
 #  - shellprocess@copy_refind_theme_chrooted
 - id:       copy_refind_theme_chrooted
   module:   shellprocess
   config:   shellprocess_copy_refind_theme_chrooted.conf
 
+#  - shellprocess@install_intel_drivers_chrooted
+- id:       install_intel_drivers_chrooted
+  module:   shellprocess
+  config:   shellprocess_install_intel_drivers_chrooted.conf
+
 #  - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
 - id:       remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
   module:   shellprocess
@@ -64,27 +84,6 @@ instances:
   module:   shellprocess
   config:   shellprocess_copy_install_logs_dont_chroot.conf
 
-#  - shellprocess@install_intel_drivers_chrooted
-- id:       install_intel_drivers_chrooted
-  module:   shellprocess
-  config:   shellprocess_install_intel_drivers_chrooted.conf
-
-#  - shellprocess@generate_dnscrypt_cert_dont_chroot
-- id:       generate_dnscrypt_cert_dont_chroot
-  module:   shellprocess
-  config:   shellprocess_generate_dnscrypt_cert_dont_chroot.conf
-
-#  - shellprocess@copy_dnscrypt_resolv_conf_chrooted
-- id:       copy_dnscrypt_resolv_conf_chrooted
-  module:   shellprocess
-  config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
-
-#  - shellprocess@copy_dnscrypt_blocklist_chrooted
-- id:       copy_dnscrypt_blocklist_chrooted
-  module:   shellprocess
-  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
-
-
 sequence:
 - show:
   - welcome@offline

settings_offline.conf

@@ -34,11 +34,31 @@ instances:
   module:   shellprocess
   config:   shellprocess_remove_ucode_chrooted.conf
 
+#  - shellprocess@generate_dnscrypt_cert_dont_chroot
+- id:       generate_dnscrypt_cert_dont_chroot
+  module:   shellprocess
+  config:   shellprocess_generate_dnscrypt_cert_dont_chroot.conf
+
+#  - shellprocess@copy_dnscrypt_resolv_conf_chrooted
+- id:       copy_dnscrypt_resolv_conf_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
+
+#  - shellprocess@copy_dnscrypt_blocklist_chrooted
+- id:       copy_dnscrypt_blocklist_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
+
 #  - shellprocess@copy_refind_theme_chrooted
 - id:       copy_refind_theme_chrooted
   module:   shellprocess
   config:   shellprocess_copy_refind_theme_chrooted.conf
 
+#  - shellprocess@install_intel_drivers_chrooted
+- id:       install_intel_drivers_chrooted
+  module:   shellprocess
+  config:   shellprocess_install_intel_drivers_chrooted.conf
+
 #  - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
 - id:       remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
   module:   shellprocess
@@ -64,27 +84,6 @@ instances:
   module:   shellprocess
   config:   shellprocess_copy_install_logs_dont_chroot.conf
 
-#  - shellprocess@install_intel_drivers_chrooted
-- id:       install_intel_drivers_chrooted
-  module:   shellprocess
-  config:   shellprocess_install_intel_drivers_chrooted.conf
-
-#  - shellprocess@generate_dnscrypt_cert_dont_chroot
-- id:       generate_dnscrypt_cert_dont_chroot
-  module:   shellprocess
-  config:   shellprocess_generate_dnscrypt_cert_dont_chroot.conf
-
-#  - shellprocess@copy_dnscrypt_resolv_conf_chrooted
-- id:       copy_dnscrypt_resolv_conf_chrooted
-  module:   shellprocess
-  config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
-
-#  - shellprocess@copy_dnscrypt_blocklist_chrooted
-- id:       copy_dnscrypt_blocklist_chrooted
-  module:   shellprocess
-  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
-
-
 sequence:
 - show:
   - welcome@offline

settings_online.conf

@@ -25,16 +25,46 @@ instances:
   module:   shellprocess
   config:   shellprocess_initialize_pacman_dont_chroot_online.conf
 
+#  - shellprocess@extract_airootfs_chrooted
+- id:       extract_airootfs_chrooted.conf
+  module:   shellprocess
+  config:   shellprocess_extract_airootfs_chrooted.conf
+
 #  - shellprocess@remove_ucode_chrooted
 - id:       remove_ucode_chrooted
   module:   shellprocess
   config:   shellprocess_remove_ucode_chrooted.conf
 
+#  - shellprocess@generate_dnscrypt_cert_dont_chroot
+- id:       generate_dnscrypt_cert_dont_chroot
+  module:   shellprocess
+  config:   shellprocess_generate_dnscrypt_cert_dont_chroot.conf
+
+#  - shellprocess@copy_dnscrypt_resolv_conf_chrooted
+- id:       copy_dnscrypt_resolv_conf_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
+
+#  - shellprocess@copy_dnscrypt_blocklist_chrooted
+- id:       copy_dnscrypt_blocklist_chrooted
+  module:   shellprocess
+  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
+
 #  - shellprocess@copy_refind_theme_chrooted
 - id:       copy_refind_theme_chrooted
   module:   shellprocess
   config:   shellprocess_copy_refind_theme_chrooted.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
+- id:       install_intel_drivers_chrooted
+  module:   shellprocess
+  config:   shellprocess_install_intel_drivers_chrooted.conf
+
 #  - shellprocess@remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
 - id:       remove_unneeded_nvidia_and_virt_machine_and_packages_chrooted
   module:   shellprocess
@@ -60,32 +90,6 @@ instances:
   module:   shellprocess
   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
-- id:       install_intel_drivers_chrooted
-  module:   shellprocess
-  config:   shellprocess_install_intel_drivers_chrooted.conf
-
-#  - shellprocess@generate_dnscrypt_cert_dont_chroot
-- id:       generate_dnscrypt_cert_dont_chroot
-  module:   shellprocess
-  config:   shellprocess_generate_dnscrypt_cert_dont_chroot.conf
-
-#  - shellprocess@copy_dnscrypt_resolv_conf_chrooted
-- id:       copy_dnscrypt_resolv_conf_chrooted
-  module:   shellprocess
-  config:   shellprocess_copy_dnscrypt_resolv_conf_chrooted.conf
-
-#  - shellprocess@copy_dnscrypt_blocklist_chrooted
-- id:       copy_dnscrypt_blocklist_chrooted
-  module:   shellprocess
-  config:   shellprocess_copy_dnscrypt_blocklist_chrooted.conf
-
-
 sequence:
 - show:
   - welcome@online
@@ -104,6 +108,7 @@ sequence:
   - shellprocess@copy_packages_dont_chroot
   - shellprocess@initialize_pacman_dont_chroot
   - pacstrap
+  - shellprocess@extract_airootfs_chrooted
   - machineid
   - fstab
   - locale

src/modules/pacstrap/pacstrap.conf

@@ -81,80 +81,5 @@ basePackages:
 # location in the installed system
 
 postInstallFiles:
-  # - "/etc/modules-load.d/zfs.conf"
+  - "/airootfs.tar.zst"
-  # - "/usr/lib/modprobe.d/nvidia-utils.conf"
+
-  # - "/usr/lib/modules-load.d/nvidia-utils.conf"
-  - "/etc/NetworkManager/NetworkManager.conf"
-  - "/etc/NetworkManager/conf.d/20-ipv4-dad.conf"
-  - "/etc/NetworkManager/dispatcher.d/09-timezone"
-  - "/etc/X11/xorg.conf.d/30-touchpad.conf"
-  - "/etc/dnscrypt-proxy/dnscrypt-proxy.toml"
-  - "/etc/dracut.conf.d/amdgpu.conf"
-  - "/etc/dracut.conf.d/defaults.conf"
-  - "/etc/dracut.conf.d/plymouth.conf"
-  - "/etc/environment"
-  - "/etc/fonts/local.conf"
-  - "/etc/issue"
-  - "/etc/locale.conf"
-  - "/etc/locale.gen"
-  - "/etc/lsb-release"
-  - "/etc/makepkg-clang-without-lto.conf"
-  - "/etc/makepkg-clang.conf"
-  - "/etc/makepkg-gcc-without-lto.conf"
-  - "/etc/makepkg-gcc.conf"
-  - "/etc/makepkg.conf"
-  - "/etc/motd"
-  - "/etc/nsswitch.conf"
-  - "/etc/pamac.conf"
-  - "/etc/plymouth/plymouthd.conf"
-  - "/etc/polkit-1/rules.d/10-timedate.rules"
-  - "/etc/refind-menu-generator/theme.conf"
-  - "/etc/reflector-simple.conf"
-  - "/etc/sddm.conf"
-  - "/etc/sddm.conf.d/10-wayland.conf"
-  - "/etc/sddm.conf.d/hidpi.conf"
-  - "/etc/sddm.conf.d/kde_settings.conf"
-  - "/etc/skel/.bashrc"
-  - "/etc/sysctl.d/99-local.conf"
-  - "/etc/systemd/journald.conf"
-  - "/etc/systemd/logind.conf"
-  - "/etc/systemd/network/20-ethernet.network"
-  - "/etc/systemd/network/20-wlan.network"
-  - "/etc/systemd/network/20-wwan.network"
-  - "/etc/systemd/resolved.conf.d/resolved.conf"
-  - "/etc/resolv.conf"
-  - "/etc/resolv.conf.bak"
-  - "/etc/systemd/timesyncd.conf"
-  - "/etc/systemd/zram-generator.conf"
-  - "/etc/tor/torrc"
-  - "/etc/vconsole.conf"
-  - "/etc/xdg/reflector/reflector.conf"
-  - "/usr/bin/GPU-Intel-installer"
-  - "/usr/local/bin/Installation_guide"
-  - "/usr/local/bin/calamares-offline"
-  - "/usr/local/bin/calamares-online"
-  - "/usr/local/bin/calamares-online.sh"
-  - "/usr/local/bin/choose-mirror"
-  - "/usr/local/bin/chrooted-cleaner-script"
-  - "/usr/local/bin/cleaner-script"
-  - "/usr/local/bin/connection-checker"
-  - "/usr/local/bin/copy-refind-theme_v1"
-  - "/usr/local/bin/copy-refind-theme_v2"
-  - "/usr/local/bin/create-pacman-keyring"
-  - "/usr/local/bin/dmcheck"
-  - "/usr/local/bin/fix-key"
-  - "/usr/local/bin/fix-keys"
-  - "/usr/local/bin/fixkey"
-  - "/usr/local/bin/fixkeys"
-  - "/usr/local/bin/livecd-sound"
-  - "/usr/local/bin/online-install-nvidia-drivers"
-  - "/usr/local/bin/prepare-live-desktop"
-  - "/usr/local/bin/prepare-live-desktop.sh"
-  - "/usr/local/bin/remove-nvidia"
-  - "/usr/local/bin/remove-ucode"
-  - "/usr/local/bin/remove-unneeded"
-  - "/usr/local/bin/removeun"
-  - "/usr/local/bin/removeun-online"
-  - "/usr/local/bin/update-mirrorlist"
-  - "/usr/share/X11/xorg.conf.d/30-touchpad.conf"
-  - "/var/lib/sddm/.config/kcminputrc"

src/modules/shellprocess/shellprocess_extract_airootfs_chrooted.conf

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+
+---
+
+i18n:
+  name: "Extracting airootfs"
+  name[ru]: "Распаковка airootfs"
+
+dontChroot: false
+
+timeout: 180
+
+script:
+  - "-tar --zst -vxf './airootfs.tar.zst' -C '/'"