From c0d82ba9b0671496e47c2ff7d86cc0540992d848 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 19 Jul 2024 15:57:25 +0200 Subject: [PATCH] remove makepkg, it will not work on only root environment --- usr/lib/archboot/cpio/hooks/base_common_system | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/lib/archboot/cpio/hooks/base_common_system b/usr/lib/archboot/cpio/hooks/base_common_system index 8e8a96c95..4203d565a 100644 --- a/usr/lib/archboot/cpio/hooks/base_common_system +++ b/usr/lib/archboot/cpio/hooks/base_common_system @@ -12,7 +12,7 @@ rpcbind*,sysinit.target.wants/lvm2*},ukify}},sysusers.d/rpcbind*,tmpfiles.d/rpcb --hard-dereference -cpf - \ etc/{bash_completion.d,ca-certificates/extracted,default,pam.d,profile.d,security,skel,ssl/certs,sysctl.d,systemd,tpm2-tss,xdg} \ usr/lib/{coreutils,cryptsetup,gconv,modules-load.d,p11-kit,pam.d,pkcs11,polkit-1,security,sysctl.d,systemd,sysusers.d,tmpfiles.d,udev} \ -usr/share/{bash-completion,dbus-1,factory,hwdata,i18n/locales,makepkg,nano,pacman/keyrings,polkit-1,readline,systemd,terminfo} \ +usr/share/{bash-completion,dbus-1,factory,hwdata,i18n/locales,nano,pacman/keyrings,polkit-1,readline,systemd,terminfo} \ | tar -C "${_ROOTFS}" -xpf - # only run on archboot container if grep -qw 'archboot' /etc/hostname; then @@ -41,7 +41,7 @@ system,timedate,userdb,home,oom,portable}ctl btm certutil chmod clear cmsutil cr dbus-{broker{,-launch},cleanup-sockets,daemon,launch,monitor,run-session,send,test-tool,\ update-activation-environment,uuidgen} dd df dir du dust exa eza false fd fzf fzf-tmux gawk gpg{,-agent,conf,-connect-agent} \ gpgme-{tool,json} insmod install kernel-install kill{,all} loadkeys ldconfig \ - login makepkg mktemp mkhomedir_helper modutil more mount.ddi mount.nfs{,4} \ + login mktemp mkhomedir_helper modutil more mount.ddi mount.nfs{,4} \ nano nologin nss-config od p11-kit pk12util pam_timestamp_check pacman{,-conf,-key,-db-upgrade} \ passwd pgrep pidof pinentry{,-curses} pk{action,check,exec,ttyagent} pluginviewer printf procs ps pwd \ rmdir sasldblistusers2 saslpasswd2 tr true repo-{add,elephant,remove} rbash rg rmmod sd sed secret-tool \ @@ -137,7 +137,7 @@ linux-with-alt-and-altgr,linux-keys-bare}.inc,qwerty/us.map.gz} \ _file_rename /usr/share/archboot/base/etc/sysctl.d/99-sysctl.conf /etc/sysctl.d/99-sysctl.conf # add pacman _map _dir /var/{cache/pacman/pkg,lib/pacman} - _map _file /etc/{pacman.conf,makepkg.conf,pacman.d/mirrorlist} + _map _file /etc/{pacman.conf,pacman.d/mirrorlist} # add pacman initialization of gpg keys _dir /etc/pacman.d/gnupg _file_rename /usr/share/archboot/base/etc/systemd/system/pacman-init.service \