From 8484ff31d5a536e0275164b1fb72ff110a18ddad Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 13 Jun 2024 20:16:12 +0200 Subject: [PATCH] fix polkit and libsasl --- usr/lib/archboot/cpio/hooks/base_common | 6 +++--- usr/lib/archboot/cpio/hooks/base_common_system | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/usr/lib/archboot/cpio/hooks/base_common b/usr/lib/archboot/cpio/hooks/base_common index b2473f26a..ce98b88a5 100644 --- a/usr/lib/archboot/cpio/hooks/base_common +++ b/usr/lib/archboot/cpio/hooks/base_common @@ -7,9 +7,9 @@ _run () # add basic apps _map _binary bash blkid bsdcpio cat cp cut dialog echo env find grep \ gzip halt head init journalctl kmod ln loadkeys logger ls{,blk,mod} \ - mkdir mkfs.btrfs modprobe less mount mountpoint mv \ - poweroff realpath reboot rm sed setfont sh shutdown sleep sulogin \ - systemctl systemd-tmpfiles udevadm umount uname + mkdir mkfs.btrfs modprobe less mount mountpoint mv poweroff \ + realpath reboot rm sed setfont sh shutdown sleep sulogin systemctl \ + systemd-tmpfiles udevadm umount uname # rdinit= kernel parameter defaults to /init # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/init/main.c _symlink /init bin/init diff --git a/usr/lib/archboot/cpio/hooks/base_common_system b/usr/lib/archboot/cpio/hooks/base_common_system index 97175c077..6fd96ff63 100644 --- a/usr/lib/archboot/cpio/hooks/base_common_system +++ b/usr/lib/archboot/cpio/hooks/base_common_system @@ -43,12 +43,12 @@ update-activation-environment,uuidgen} dd df dir du false gawk gpg{,-agent,conf, gpgme-{tool,json} insmod install kernel-install kill{,all} loadkeys ldconfig \ login makepkg 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} printf ps pwd rmdir tr true \ - repo-{add,elephant,remove} rbash rmmod secret-tool shlibsign sign{tool,ver} sort \ - ssltap stat symkeyutil systemd-{ac-power,analyze,ask-password,cat,cgls,cgtop,confextdelta,\ -detect-virt,escape,firstboot,hwdb,inhibit,machine-id-setup,mount,notify,nspawn,path,resolve,repartrun,\ -socket-activate,stdio-bridge,sysusers,tty-ask-password-agent,umount,creds,cryptenroll,dissect,id128,sysext} \ - tar tee testpkg top touch trust tty unix_{chkpwd,update} /usr/lib/dbus-1.0/dbus-daemon-launch-helper \ + passwd pgrep pidof pinentry{,-curses} pk{action,check,exec,ttyagent} pluginviewer printf ps pwd \ + rmdir sasldblistusers2 saslpasswd2 tr true repo-{add,elephant,remove} rbash rmmod secret-tool \ + shlibsign sign{tool,ver} sort ssltap stat symkeyutil systemd-{ac-power,analyze,ask-password,cat,\ +cgls,cgtop,confextdelta,detect-virt,escape,firstboot,hwdb,inhibit,machine-id-setup,mount,notify,nspawn,path,\ +resolve,repartrun,socket-activate,stdio-bridge,sysusers,tty-ask-password-agent,umount,creds,cryptenroll,dissect,\ +id128,sysext} tar tee testpkg top touch trust tty unix_{chkpwd,update} /usr/lib/dbus-1.0/dbus-daemon-launch-helper \ umount.nfs{,4} update-ca-trust vercmp wc yes zstd # use patched aarch64 pacman-key # https://archlinuxarm.org/forum/viewtopic.php?f=15&t=16701 @@ -56,6 +56,8 @@ socket-activate,stdio-bridge,sysusers,tty-ask-password-agent,umount,creds,crypte _install_files _file_rename "/usr/share/archboot/patches/pacman-key-aarch64" "/usr/bin/pacman-key" fi + # add libsasl + _full_dir /usr/lib/sasl2 # add nano _file_rename /etc/nanorc /etc/nanorc # add syntax highlighting