diff --git a/etc/archboot/defaults b/etc/archboot/defaults index dd324d2fe..b989b68e3 100644 --- a/etc/archboot/defaults +++ b/etc/archboot/defaults @@ -2,7 +2,9 @@ # packages to install (eg. firmware, kernel packages) _PACKAGES="base linux linux-firmware linux-firmware-marvell" # Download packages for pacman cache directory -_DOWNLOAD_PACKAGES='xorg xfce4 tigervnc chromium breeze-icons gvfs gvfs-smb gvfs-nfs gparted' +_DOWNLOAD_PACKAGES="xorg xfce4 tigervnc chromium breeze-icons gvfs \ + gvfs-smb thunar-archive-plugin thunar-volman \ + file-roller gparted" # grub setup _GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg" _GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png" diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh index 2ca1abc6b..0f1fa8056 100644 --- a/usr/lib/archboot/update-installer.sh +++ b/usr/lib/archboot/update-installer.sh @@ -22,17 +22,17 @@ usage () { echo -e " \033[1m-u\033[0m Update scripts: setup, quickinst, tz, km and helpers." echo -e "" echo -e " \033[1m-latest\033[0m Launch latest archboot environment (using kexec)." - echo -e " This operation needs at least \033[1m1.9 GB RAM\033[0m." + echo -e " This operation needs at least \033[1m2.3 GB RAM\033[0m." echo "" echo -e " \033[1m-latest-install\033[0m Launch latest archboot environment with downloaded" echo -e " package cache (using kexec)." - echo -e " This operation needs at least \033[1m2.6 GB RAM\033[0m." + echo -e " This operation needs at least \033[1m3.2 GB RAM\033[0m." echo "" echo -e " \033[1m-latest-image\033[0m Generate latest image files in /archboot directory" - echo -e " This operation needs at least \033[1m3.5 GB RAM\033[0m." + echo -e " This operation needs at least \033[1m5.0 GB RAM\033[0m." echo "" echo -e " \033[1m-launch-xfce\033[0m Launch XFCE desktop with VNC sharing enabled." - echo -e " This operation needs at least \033[1m3.4 GB RAM\033[0m." + echo -e " This operation needs at least \033[1m3.5 GB RAM\033[0m." echo "" echo -e " \033[1m-h\033[0m This message." exit 0 @@ -234,7 +234,6 @@ _cleanup_xfce() { echo "Cleanup archboot environment ..." rm -rf /usr/share/{i18n,locale,man,info,doc,gtk-doc,ibus,perl5} rm -rf /usr/include - rm -rf /usr/lib/libLLVM* rm -rf /usr/lib/libgo.* } @@ -242,7 +241,8 @@ _launch_xfce() { X_PACKAGES="llvm-libs gcc-libs perl glibc xorg libtiff glib2 chromium libcups harfbuzz \ avahi nss breeze-icons tigervnc p11-kit libp11-kit gvfs fuse tpm2-tss \ libsecret gparted gvfs-smb smbclient libcap tevent libbsd libldap tdb ldb \ - libmd jansson libsasl gvfs-nfs xfce4" + libmd jansson libsasl xfce4 thunar-archive-plugin thunar-volman file-roller" + # try to save RAM by calling the cleanup hook and installing each package alone if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then echo "Install packages ..." _INSTALL_SOURCE="file:///var/cache/pacman/pkg" diff --git a/usr/lib/initcpio/install/archboot_base_common b/usr/lib/initcpio/install/archboot_base_common index 361ccdeea..8a98f8164 100644 --- a/usr/lib/initcpio/install/archboot_base_common +++ b/usr/lib/initcpio/install/archboot_base_common @@ -117,7 +117,7 @@ build () ### add pacman map add_binary pacman pacman-conf pacman-key pacman-db-upgrade makepkg \ - repo-add repo-elephant testpkg vercmp curl gpg-agent haveged gpg repo-remove + repo-add repo-elephant testpkg vercmp curl gpg-agent haveged gpg gpgconf repo-remove map add_dir "/var/cache/pacman/pkg" "/var/lib/pacman" map add_file "/etc/pacman.conf" "/etc/makepkg.conf" "/etc/pacman.d/mirrorlist" # add pacman initialisation of gpg keys