🚧 update

airootfs/etc/skel/.gnupg/gpg.conf

@@ -1,7 +0,0 @@
-no-greeting
-no-permission-warning
-lock-never
-keyserver-options timeout=10
-keyserver-options import-clean
-keyserver-options no-self-sigs-only
-keyserver hkp://keys.openpgp.org

efiboot/loader/entries/01-archiso-x86_64-linux.conf

@@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 title   CachyOS x86_64 UEFI Default
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img

efiboot/loader/entries/02-archiso-x86_64-linux-nv.conf

@@ -1,7 +1,4 @@
-#
+title   CachyOS x86_64 UEFI NVIDIA (latest cards only)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-title   CachyOS x86_64 UEFI NVIDIA (nonfree, latest cards only, no legacy) (CD)
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img

efiboot/loader/loader.conf

@@ -1,5 +1,2 @@
-#
+timeout 10
-# SPDX-License-Identifier: GPL-3.0-or-later
+default 01-archiso-x86_64-linux.conf
-
-timeout 3
-default archiso-x86_64-linux.conf

packages.x86_64

@@ -5,7 +5,6 @@ linux
 linux-headers
 linux-firmware
 mkinitcpio
-mkinitcpio-busybox
 mkinitcpio-nfs-utils
 cachyos-mirrorlist
 cachyos-keyring
@@ -24,6 +23,8 @@ man-db
 man-pages
 mdadm
 nano
+tmux
+vim
 perl
 s-nail
 sysfsutils
@@ -63,6 +64,7 @@ f2fs-tools
 xfsprogs
 e2fsprogs
 lvm2
+lynx
 mtools
 ntfs-3g
 reiserfsprogs
@@ -84,6 +86,7 @@ zfs-utils
 
 #general-system
 mlocate
+mc
 crda
 dialog
 dmraid
@@ -206,7 +209,6 @@ modemmanager
 netctl
 net-tools
 networkmanager
-networkmanager-openvpn
 nss-mdns
 usb_modeswitch
 whois
@@ -216,6 +218,7 @@ dnsmasq
 elinks
 ethtool
 openconnect
+openssh
 openvpn
 rp-pppoe
 wireless-regdb
@@ -273,16 +276,21 @@ qt5-tools
 calamares
 calamares-branding-cachyos
 
+#welcome-app
+gtkmm3
+fmt
+#cachyos-hello
+
 #cachyos-repo
 #rate-mirrors-bin
 mkinitcpio-openswap
 ckbcomp
 #cachyos-grub-theme
 #cachyos-nord-kde-theme-git
+cachyos-settings
 cachyos-theming
 paru
 yad
-#welcome
 meld
 #keyserver-rank-cachy
 reflector-simple

profiledef.sh

@@ -7,15 +7,18 @@ iso_publisher="CachyOS <https://cachyos.org>"
 iso_application="CachyOS Live/Rescue CD"
 iso_version="$(date +%Y.%m.%d)"
 install_dir="arch"
+buildmodes=('iso')
+quiet="n"
 work_dir=work
 out_dir=out
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
+airootfs_image_type="squashfs"
 airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 file_permissions=(
-  ["/etc/shadow"]="0:0:0400"
+  ["/etc/shadow"]="0:0:400"
-  ["/etc/gshadow"]="0:0:0400"
+  ["/etc/gshadow"]="0:0:400"
   ["/root"]="0:0:750"
   ["/root/.automated_script.sh"]="0:0:755"
   ["/etc/sudoers.d"]="0:0:750"

run_before_squashfs.sh

@@ -79,6 +79,11 @@ rm mirrorlist
 #pacman-key --refresh-keys
 #pacman -Syy
 
+# to install locally builded packages on ISO:
+#pacman -U --noconfirm /root/cachyos-hello-0.6.7-1-x86_64.pkg.tar.zst
+#rm /root/cachyos-hello-0.6.7-1-x86_64.pkg.tar.zst
+#rm /var/log/pacman.log
+
 # now done with recreating pacman keyring inside calamares:
 # shellprocess_initialize_pacman
 #rm -R /etc/pacman.d/gnupg
@@ -86,8 +91,10 @@ rm mirrorlist
 sed -i 's|^GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\)\"$|GRUB_CMDLINE_LINUX_DEFAULT=\"\1 nowatchdog\"|' /etc/default/grub
 sed -i 's?GRUB_DISTRIBUTOR=.*?GRUB_DISTRIBUTOR=\"CachyOS\"?' /etc/default/grub
 sed -i 's?\#GRUB_THEME=.*?GRUB_THEME=\/boot\/grub\/themes\/CachyOS\/theme.txt?g' /etc/default/grub
-echo 'GRUB_DISABLE_SUBMENU=y' >> /etc/default/grub
+sed -i 's?\#GRUB_DISABLE_SUBMENU=y?GRUB_DISABLE_SUBMENU=y?g' /etc/default/grub
-rm /boot/grub/grub.cfg
+echo 'GRUB_DISABLE_OS_PROBER=false' >> /etc/default/grub
+# rm /boot/grub/grub.cfg --> seems mkarchiso is doing this now?
+
 wget https://gitlab.com/cachyos/liveuser-desktop-settings/-/raw/master/dconf/xed.dconf
 dbus-launch dconf load / < xed.dconf
 sudo -H -u cachyos bash -c 'dbus-launch dconf load / < xed.dconf'

syslinux/archiso.cfg

@@ -1,14 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-DEFAULT select
-
-LABEL select
-COM32 boot/syslinux/whichsys.c32
-APPEND -pxe- pxe -sys- sys -iso- sys
-
-LABEL pxe
-CONFIG boot/syslinux/archiso_pxe.cfg
-
-LABEL sys
-CONFIG boot/syslinux/archiso_sys.cfg

syslinux/archiso_head.cfg

@@ -1,9 +1,6 @@
-#
+SERIAL 0 115200
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-SERIAL 0 38400
 UI vesamenu.c32
-MENU TITLE Arch Linux
+MENU TITLE CachyOS
 MENU BACKGROUND splash.png
 
 MENU WIDTH 78

syslinux/archiso_pxe-linux.cfg

@@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 LABEL cachyos_nbd
 TEXT HELP
 Boot the CachyOS install medium using NBD.

syslinux/archiso_pxe.cfg

@@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 INCLUDE archiso_head.cfg
 
 INCLUDE archiso_pxe-linux.cfg

syslinux/archiso_sys-linux.cfg

@@ -6,7 +6,7 @@ TEXT HELP
 Boot the CachyOS install medium on BIOS.
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
-MENU LABEL CachyOS install default (x86_64, BIOS)
+MENU LABEL CachyOS default (x86_64, BIOS)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 modprobe.blacklist=nvidia
@@ -14,10 +14,10 @@ APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABE
 # Nvidia propritary (Non-Free)
 LABEL cachyos-nvidia
 TEXT HELP
-Boot the CachyOS install medium on BIOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY.
+Boot the CachyOS install medium on Bios NVIDIA-NONFREE driver LATEST-CARDS NO-LEGACY
 It allows you to install CachyOS or perform system maintenance.
 ENDTEXT
-MENU LABEL CachyOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY (x86_64)
+MENU LABEL CachyOS NVIDIA (latest cards, x86_64, BIOS)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1

syslinux/archiso_sys.cfg

@@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 INCLUDE archiso_head.cfg
 
 DEFAULT cachyos

syslinux/archiso_tail.cfg

@@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 LABEL existing
 TEXT HELP
 Boot an existing operating system.

syslinux/syslinux.cfg

@@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 DEFAULT select
 
 LABEL select