root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

shorten base_common_system

Browse source
This commit is contained in:
Tobias Powalowski 2023-11-10 12:59:57 +01:00
parent ee4245a750
commit 55c1d176f1
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr/lib/archboot/cpio/hooks/base_common_mods
View file

@ -14,7 +14,8 @@ _run ()
_map _mod zram btrfs zstd libcrc32c
### keyboard modules
_all_mods -f '_cs|ssb-hcd' '/usb/host'
_all_mods '/hid/hid-(alps|apple|asus|belkin|cherry|chicony|corsair|elan|hyperv|kensignton|lenovo|logitech|magicmouse|microsoft|razer|redragon|roccat|samsung|sony|speedlink|steelseries)'
_all_mods '/hid/hid-(alps|apple|asus|belkin|cherry|chicony|corsair|elan|hyperv|kensignton|\
lenovo|logitech|magicmouse|microsoft|razer|redragon|roccat|samsung|sony|speedlink|steelseries)'
_mod usbhid
_all_mods -f 'parkbd' '/input/serio|mouse|keyboard/(applespi|atkbd)'
_all_mods -f '9pnet|bluetooth|fs' 'virtio'

25
usr/lib/archboot/cpio/hooks/base_common_system
View file

@ -7,8 +7,8 @@ _run ()
# remove conflicting grub, rpcbind and ukify files
tar -C / --exclude=etc/systemd/system/multi-user.target.wants/remote-fs.target \
--exclude=usr/share/bash-completion/completions/grub \
--exclude=usr/lib/{modules-load.d/cdrecord.conf,systemd/{system/{blk-availability.service,lvm2*,rpcbind*,sysinit.target.wants/lvm2*},ukify},sysusers.d/rpcbind*,\
tmpfiles.d/rpcbind*} \
--exclude=usr/lib/{modules-load.d/cdrecord.conf,systemd/{system/{blk-availability.service,lvm2*,\
rpcbind*,sysinit.target.wants/lvm2*},ukify},sysusers.d/rpcbind*,tmpfiles.d/rpcbind*} \
--hard-dereference -cpf - \
etc/{ca-certificates/extracted,default,pam.d,pinentry,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,security,sysctl.d,systemd,sysusers.d,tmpfiles.d,udev} \
@ -65,19 +65,17 @@ protocols,request-key.conf,securetty,services}
# add systemd service apps
_map _binary mount.nfs4 umount.nfs umount.nfs4 mount.nfs loadkeys
# dbus files
_map _binary dbus-cleanup-sockets dbus-daemon dbus-launch dbus-monitor dbus-run-session dbus-send dbus-test-tool \
dbus-update-activation-environment dbus-uuidgen /usr/lib/dbus-1.0/dbus-daemon-launch-helper
_map _binary dbus-{cleanup-sockets,daemon,launch,monitor,run-session,send,test-tool,\
update-activation-environment,uuidgen} /usr/lib/dbus-1.0/dbus-daemon-launch-helper
# tpm2-tss files
_map _binary secret-tool pinentry pinentry-curses gpgme-tool gpgme-json
# systemd files
_map _binary systemd-umount busctl bootctl coredumpctl hostnamectl journalctl kernel-install localectl \
loginctl machinectl mount.ddi networkctl systemctl systemd-ac-power systemd-analyze systemd-ask-password \
systemd-cat systemd-cgls systemd-cgtop systemd-confext \
systemd-delta systemd-detect-virt systemd-escape systemd-firstboot systemd-hwdb systemd-inhibit systemd-machine-id-setup \
systemd-mount systemd-notify systemd-nspawn systemd-path systemd-resolve \
systemd-run systemd-socket-activate systemd-stdio-bridge systemd-sysusers \
systemd-tty-ask-password-agent timedatectl systemd-repart userdbctl homectl oomctl portablectl systemd-creds \
systemd-cryptenroll systemd-dissect systemd-id128 systemd-sysext
_map _binary busctl bootctl coredumpctl hostnamectl journalctl \
kernel-install localectl loginctl machinectl mount.ddi networkctl \
systemctl systemd-{ac-power,analyze,ask-password,cat,cgls,cgtop,confext\
delta,detect-virt,escape,firstboot,hwdb,inhibit,machine-id-setup,mount,notify,nspawn,path,resolve,repart\
run,socket-activate,stdio-bridge,sysusers,tty-ask-password-agent,umount,creds,cryptenroll,dissect,id128,sysext} \
timedatectl systemd- userdbctl homectl oomctl portablectl
_map _dir /etc/tmpfiles.d /etc/modules-load.d /etc/binfmt.d/
_file_rename /usr/share/archboot/base/etc/locale.conf /etc/locale.conf
_file_rename /usr/share/archboot/base/etc/vconsole.conf /etc/vconsole.conf
@ -111,7 +109,8 @@ protocols,request-key.conf,securetty,services}
# fix tmpfiles startup
_map _file /usr/lib/{libnss_compat.so.2,libnsl.so.1}
# add schedule rules file
_file_rename /usr/share/archboot/base/etc/udev/rules.d/60-ioschedulers.rules /etc/udev/rules.d/60-ioschedulers.rules
_file_rename /usr/share/archboot/base/etc/udev/rules.d/60-ioschedulers.rules \
/etc/udev/rules.d/60-ioschedulers.rules
# add minimal vconsole
_map _file /usr/share/kbd/keymaps/i386/{include/{qwerty-layout,compose,\
linux-with-alt-and-altgr,linux-keys-bare}.inc,qwerty/us.map.gz} \