cleanup cleanup hooks

usr/lib/archboot/cpio/hooks/base_common_cleanup

@@ -5,11 +5,9 @@
 _run ()
 {
     ! grep -qw 'archboot' /etc/hostname && return
-    _APPS="journalctl setfont mkfs.btrfs gzip systemctl mountpoint"
     _install_files
-    for i in ${_APPS}; do
+    rm /usr/bin/{bsdcpio,blkid,gzip,journalctl,less,lsmod,mkfs.btrfs,\
-        rm /usr/bin/"${i}"
+mountpoint,setfont,sulogin,systemctl}
-    done
 }
 
 # vim: set ft=sh ts=4 sw=4 et:

usr/lib/archboot/cpio/hooks/base_common_system

@@ -54,8 +54,7 @@ var/lib/pacman/local \
     # add needed files from running system
     _map _file /etc/{crypttab,fstab,host.conf,hosts,inputrc,mke2fs.conf,nsswitch.conf,\
 protocols,request-key.conf,securetty,services}
-    _BASIC_CONFIG="issue tmpfiles.d/var.conf"
+    for i in issue tmpfiles.d/var.conf; do
-    for i in ${_BASIC_CONFIG}; do
         _file_rename "/usr/share/archboot/base/etc/${i}" "/etc/${i}"
     done
     # fixing network support from glibc

usr/lib/archboot/cpio/hooks/base_common_system_cleanup

@@ -10,19 +10,13 @@ _run ()
     rm -f /tmp/etc/systemd/system/pacman-init.service
     # add created gpg keyring
     cp -ar /etc/pacman.d/gnupg /tmp/etc/pacman.d
-    _APPS="login nologin mount.nfs4 umount.nfs umount.nfs4 mount.nfs loadkeys \
-           dbus-cleanup-sockets dbus-daemon dbus-launch dbus-monitor dbus-run-session dbus-send dbus-test-tool \
-           dbus-update-activation-environment dbus-uuidgen systemd-umount busctl bootctl coredumpctl hostnamectl \
-           kernel-install localectl loginctl machinectl networkctl systemd-analyze systemd-ask-password \
-           systemd-cat systemd-cgls systemd-cgtop 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"
     _install_files
-    for i in ${_APPS}; do
+    rm /usr/bin/{login,nologin,mount.{nfs,nfs4},umount.{nfs,nfs4},loadkeys,dbus-{cleanup-sockets,daemon,\
-        rm /usr/bin/"${i}"
+launch,monitor,run-session,send,test-tool,update-activation-environment,uuidgen},busctl,bootctl,coredumpctl,\
-    done
+hostnamectl,kernel-install,localectl,loginctl,machinectl,networkctl,systemd-{analyze,ask-password,cat,cgls,\
+cgtop,delta,detect-virt,escape,firstboot,hwdb,inhibit,machine-id-setup,mount,notify,nspawn,path,resolve,\
+run,umount,socket-activate,stdio-bridge,sysusers,tty-ask-password-agent,repart,creds,cryptenroll,dissect,\
+id128,sysext},timedatectl,userdbctl,homectl,oomctl,portablectl}
 }
 
 # vim: set ft=sh ts=4 sw=4 et:

usr/lib/archboot/cpio/hooks/base_system

@@ -4,47 +4,44 @@
 
 _run ()
 {
-    _map _binary head id cksum tail test uptime w who whoami xargs \
+    _map _binary head id cksum tail test uptime w who whoami xargs swapon uniq seq fdisk \
-          swapon uniq seq fdisk sfdisk cfdisk parted free less \
+                 sfdisk cfdisk parted free chgrp chown dmesg egrep fgrep stty hdparm sync \
-          chgrp chown dmesg egrep fgrep stty hdparm sync \
+                 dirname chroot expr bzip2 su sdparm tput losetup mkfifo mknod readlink \
-          dirname chroot expr bzip2 su sdparm tput bsdcpio \
+                 lzmadec lzop xz last wall mesg utmpdump xzdec switch_root pivot_root chcpu \
-          losetup mkfifo mknod readlink lzmadec lzop xz last wall mesg utmpdump \
+                 ctrlaltdel gdisk sgdisk cgdisk fixparts findmnt lsfd lsblk swaplabel cal \
-          xzdec switch_root pivot_root chcpu ctrlaltdel gdisk sgdisk cgdisk fixparts findmnt \
+                 chrt col colcrt colrm column fallocate flock getopt ionice ipcmk ipcrm \
-          lsfd lsblk swaplabel cal chrt col colcrt colrm column fallocate flock getopt \
+                 ipcs swapoff look lscpu mcookie namei prlimit rename renice rev script \
-          ionice ipcmk ipcrm ipcs swapoff look lscpu mcookie namei prlimit rename \
+                 scriptreplay setarch setsid setterm taskset ul unshare uuidgen whereis \
-          renice rev script scriptreplay setarch setsid setterm taskset ul unshare \
+                 write addpart delpart ldattach partx readprofile rtcwake uuidd sysctl \
-          uuidgen whereis write addpart delpart ldattach partx readprofile rtcwake uuidd \
+                 pidwait pkill pmap pwdx slabtop tload vmstat watch eject keyctl request-key \
-          sysctl pidwait pkill pmap pwdx slabtop tload vmstat watch eject keyctl request-key \
+                 tac resizepart lslocks wdctl zless zgrep fold hexdump ldd shred blockdev \
-          tac sulogin resizepart lslocks wdctl zless zgrep fold hexdump ldd \
+                 blkdiscard newgrp nsenter runuser vigr vipw diff depmod linux32 linux64 \
-          shred blockdev blkdiscard newgrp nsenter runuser vigr vipw diff depmod \
+                 lzcat lzcmp lzdiff lzegrep lzfgrep lzgrep lzegrep lzless lzmore lzma \
-          linux32 linux64 lsmod lzcat lzcmp lzdiff lzegrep lzfgrep lzgrep lzegrep \
+                 modinfo reset unlzma unxz xzcat lastb blkzone chmem choom fincore \
-          lzless lzmore lzma modinfo reset unlzma unxz xzcat lastb \
+                 hardlink irqtop lsipc lsirq lslogins lsmem lsns mkfs scriptlive setpriv \
-          blkzone chmem choom fincore hardlink irqtop lsipc lsirq lslogins lsmem lsns mkfs \
+                 uclampset uname26 uuidparse zramctl [ b2sum base32 base64 basenc chcon \
-          scriptlive setpriv uclampset uname26 uuidparse zramctl [ b2sum base32 base64 \
+                 comm csplit dircolors expand factor fmt hostid join link logname md5sum \
-          basenc chcon comm csplit dircolors expand factor fmt hostid join link \
+                 nice nl nohup nproc numfmt paste pathchk pinky pr printenv ptx realpath \
-          logname md5sum nice nl nohup nproc numfmt paste pathchk pinky pr printenv ptx realpath \
+                 runcon sha1sum sha224sum sha256sum sha384sum sha512sum shuf split stdbuf \
-          runcon sha1sum sha224sum sha256sum sha384sum sha512sum shuf split stdbuf sum timeout truncate \
+                 sum timeout truncate tsort unexpand unlink users vdir fuser prtstat pslog \
-          tsort unexpand unlink users vdir fuser prtstat pslog pstree newgid_map newuid_map \
+                 pstree newgid_map newuid_map lzmainfo xzcmp xzgrep xzegrep xzfgrep gzexe \
-          lzmainfo xzcmp xzgrep xzegrep xzfgrep gzexe uncompress zcmp zdiff zegrep zfgrep zforce zmore znew \
+                 uncompress zcmp zdiff zegrep zfgrep zforce zmore znew bunzip2 bzcat bzdiff \
-          bunzip2 bzcat bzdiff bzgrep bzip2recover bzmore chacl getfacl setfacl attr getfattr \
+                 bzgrep bzip2recover bzmore chacl getfacl setfacl attr getfattr setfattr \
-          setfattr pzstd unzstd zstdcat zstdgrep zstdless zstdmt lz4 lz4c lz4cat unlz4 gunzip zcat wipe \
+                 pzstd unzstd zstdcat zstdgrep zstdless zstdmt lz4 lz4c lz4cat unlz4 gunzip \
-          capsh getcap getpcaps setcap file blkpr fadvise isosize pg pipesz tunelp
+                 zcat wipe capsh getcap getpcaps setcap file blkpr fadvise isosize pg pipesz tunelp
-
     [[ "${_RUNNING_ARCH}" == "x86_64" ]] && _map _binary i386 x86_64 peekfd waitpid
     [[ "${_RUNNING_ARCH}" == "aarch64" ]] && _binary peekfd
     [[ "${_RUNNING_ARCH}" == "riscv64" ]] && _map _binary waitpid
-    ### add C.UTF-8 locale
+    # add C.UTF-8 locale
     _dir /usr/lib/locale
     [[ -d /usr/lib/locale/C.utf8 ]] && _full_dir /usr/lib/locale/C.utf8
-    ### add custom locale
+    # add custom locale
     [[ -e "/usr/lib/locale/locale-archive" ]] && _file /usr/lib/locale/locale-archive
-    
+    # add shadow
-    ### add shadow
     _map _binary groups chage chfn chsh expiry faillog gpasswd lastlog \
           chgpasswd chpasswd groupadd groupdel groupmems groupmod grpck grpconv grpunconv \
           newusers pwck pwconv pwunconv useradd userdel usermod sg getsubids
-
+    # fix licenses
-    ### fix licenses
     _map _file /usr/share/licenses/file/COPYING /usr/share/licenses/bzip2/LICENSE \
                  /usr/share/licenses/hdparm/LICENSE.TXT /usr/share/licenses/ncurses/COPYING \
                  /usr/share/licenses/sdparm/LICENSE /usr/share/licenses/zlib/LICENSE

usr/lib/archboot/cpio/hooks/base_system_cleanup

@@ -5,44 +5,37 @@
 _run ()
 {
     ! grep -qw 'archboot' /etc/hostname && return
-    _APPS="head id cksum tail test uptime w who whoami xargs \
+    _install_files
-          swapon uniq seq fdisk sfdisk cfdisk parted free less \
+    rm /usr/bin/{head,id,cksum,tail,test,uptime,w,who,whoami,xargs,swapon,uniq,seq,fdisk,\
-          chgrp dmesg egrep fgrep stty hdparm sync bsdcpio\
+sfdisk,cfdisk,parted,free,chgrp,dmesg,egrep,fgrep,stty,hdparm,sync,dirname,chroot,expr,\
-          dirname chroot expr bunzip2 bzcat bzip2 su sdparm tput \
+bunzip2,bzcat,bzip2,su,sdparm,tput,losetup,mkfifo,mknod,,lzmadec,lzop,lzma,lzcat,unlzma,\
-          losetup mkfifo mknod  lzmadec lzop lzma lzcat unlzma unxz xzcat \
+unxz,xzcat,lastb,last,wall,mesg,utmpdump,xzdec,switch_root,pivot_root,chcpu,ctrlaltdel,\
-          lastb last wall mesg utmpdump xzdec switch_root pivot_root chcpu ctrlaltdel \
+gdisk,sgdisk,cgdisk,fixparts,findmnt,lsblk,swaplabel,cal,chrt,col,colcrt,colrm,column,\
-          gdisk sgdisk cgdisk fixparts findmnt lsblk swaplabel cal chrt col colcrt \
+fallocate,flock,getopt,ionice,ipcmk,ipcrm,ipcs,swapoff,look,lsfd,lscpu,mcookie,namei,\
-          colrm column fallocate flock getopt ionice ipcmk ipcrm ipcs swapoff \
+prlimit,rename,renice,rev,script,scriptreplay,uname26,linux32,linux64,setarch,setsid,\
-          look lsfd lscpu mcookie namei prlimit rename renice rev script scriptreplay uname26 \
+setterm,taskset,ul,unshare,uuidgen,whereis,write,addpart,delpart,ldattach,partx,\
-          linux32 linux64 setarch setsid setterm taskset ul unshare uuidgen whereis write \
+readprofile,rtcwake,uuidd,sysctl,pidwait,pkill,pmap,pwdx,slabtop,tload,vmstat,watch,\
-          addpart delpart ldattach partx readprofile rtcwake uuidd sysctl pidwait pkill pmap \
+eject,keyctl,request-key,tac,resizepart,lslocks,wdctl,zless,zgrep,fold,hexdump,shred,\
-          pwdx slabtop tload vmstat watch eject keyctl request-key tac \
+blockdev,blkdiscard,newgrp,nsenter,runuser,vigr,vipw,diff,lzcmp,lzdiff,lzegrep,\
-          sulogin resizepart lslocks wdctl zless zgrep fold hexdump shred blockdev blkdiscard \
+lzgrep,lzfgrep,xzegrep,xzfgrep,xzgrep,lzless,lzmore,reset,blkzone,\chmem,choom,fincore,\
-          newgrp nsenter runuser vigr vipw diff lsmod lzcmp lzdiff lzegrep \
+hardlink,irqtop,lsipc,lsirq,lslogins,lsmem,lsns,mkfs,scriptlive,setpriv,uclampset,\
-          lzgrep lzfgrep xzegrep xzfgrep xzgrep lzless lzmore reset blkzone \
+uuidparse,zramctl,[,b2sum,base32,base64,basenc,chcon,comm,csplit,dircolors,expand,\
-          chmem choom fincore hardlink irqtop lsipc lsirq lslogins lsmem lsns mkfs scriptlive \
+factor,fmt,hostid,join,link,logname,md5sum,nice,nl,nohup,nproc,numfmt,paste,pathchk,\
-          setpriv uclampset uuidparse zramctl [ b2sum base32 base64 basenc chcon comm csplit \
+pinky,pr,printenv,ptx,runcon,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shuf,\
-          dircolors expand factor fmt hostid join link logname md5sum nice nl nohup \
+split,stdbuf,sum,timeout,truncate,tsort,unexpand,unlink,users,vdir,fuser,prtstat,pslog,\
-          nproc numfmt paste pathchk pinky pr printenv ptx runcon sha1sum sha224sum \
+pstree,newgidmap,newuidmap,lzmainfo,xzcmp,gzexe,uncompress,zcmp,zdiff,zegrep,zfgrep,\
-          sha256sum sha384sum sha512sum shuf split stdbuf sum timeout truncate tsort \
+zforce,zmore,znew,bzdiff,bzgrep,bzip2recover,bzmore,chacl,getfacl,setfacl,attr,getfattr,\
-          unexpand unlink users vdir fuser prtstat pslog pstree newgidmap newuidmap \
+setfattr,pzstd,unzstd,zstdcat,zstdgrep,zstdless,zstdmt,lz4,lz4c,lz4cat,unlz4,gunzip,zcat,\
-          lzmainfo xzcmp gzexe uncompress zcmp zdiff zegrep zfgrep zforce zmore znew \
+wipe,file,blkpr,fadvise,isosize,pg,pipesz,tunelp}
-          bzdiff bzgrep bzip2recover bzmore chacl getfacl setfacl attr getfattr \
-          setfattr pzstd unzstd zstdcat zstdgrep zstdless zstdmt lz4 lz4c lz4cat unlz4 \
-          gunzip zcat wipe file blkpr fadvise isosize pg pipesz tunelp"
     if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
-        _APPS="i386 x86_64 peekfd waitpid ${_APPS}"
+        rm /usr/bin/{i386,x86_64,peekfd,waitpid}
     fi
     if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
-        _APPS="peekfd ${_APPS}"
+        rm /usr/bin/peekfd
     fi
     if [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
-        _APPS="waitpid ${_APPS}"
+        rm /usr/bin/waitpid
     fi
-    _install_files
-    for i in ${_APPS}; do
-        rm /usr/bin/"${i}"
-    done
 }
 
 # vim: set ft=sh ts=4 sw=4 et:

usr/lib/archboot/cpio/hooks/filesystems

@@ -4,7 +4,7 @@
 
 _run ()
 {
-    _map _binary mkswap badblocks blkid debugfs dumpe2fs e2fsck \
+    _map _binary mkswap badblocks debugfs dumpe2fs e2fsck \
         e2image e2undo findfs fsck logsave mkfs.ext2 resize2fs chattr lsattr e2freefrag filefrag \
         jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs xfs_copy xfs_db xfs_estimate xfs_fsr xfs_io \
         xfs_logprint xfs_mdrestore xfs_repair xfs_rtcp mkdosfs dosfsck fatlabel mount.smb3 mount.cifs \

usr/lib/archboot/cpio/hooks/filesystems_cleanup

@@ -5,27 +5,22 @@
 _run ()
 {
     ! grep -qw 'archboot' /etc/hostname && return
-    _APPS="mkswap badblocks blkid debugfs dumpe2fs e2fsck e2image e2undo findfs fsck \
-          logsave mkfs.ext2 resize2fs chattr lsattr e2freefrag filefrag \
-          jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs \
-          xfs_copy xfs_db xfs_estimate xfs_fsr xfs_io xfs_logprint xfs_mdrestore xfs_repair xfs_rtcp \
-          mkdosfs dosfsck dosfslabel fatlabel mount.smb3 mount.cifs \
-          fsck.ext2 fsck.ext3 fsck.ext4 e2label tune2fs mkfs.ext3 \
-          mkfs.ext4 mke2fs fsck.jfs mkfs.jfs wipefs btrfs-find-root btrfs-image \
-          btrfs-map-logical btrfs-select-super btrfstune mkfs.nilfs2 mount.nilfs2 \
-          nilfs_cleanerd cifs.upcall cifscreds getcifsacl setcifsacl smb2-quota smbinfo umount.nilfs2 \
-          chcp dumpseg lscp lssu mkcp rmcp fsck.cramfs fsck.minix fsfreeze fstrim mkfs.bfs \
-          mkfs.cramfs mkfs.minix mkfs.f2fs fsck.exfat mkfs.exfat \
-          tune.exfat exfatlabel dump.exfat fatresize nvme  fsck.msdos fsck.vfat mkfs.vfat mkfs.msdos  \
-          fsck.btrfs e2mmpstatus e2scrub e2scrub_all e4crypt e4defrag defrag.f2fs dump.f2fs f2fs_io \
-          f2fscrypt fibmap.f2fs resize.f2fs sload.f2fs fsck.f2fs parse.f2fs blkmapd nfsconf \
-          nfsdcld nfsdclddb nfsdclnts nfsidmap nfsv4.exportd nilfs-clean nilfs-resize nilfs-tune \
-          xfs_growfs xfs_quota xfs_spaceman compile_et mk_cmds fsck.xfs xfs_admin \
-          xfs_bmap xfs_freeze xfs_info xfs_metadump xfs_mkfile xfs_ncheck"
     _install_files
-    for i in ${_APPS}; do
+    rm /usr/bin/{mkswap,badblocks,debugfs,dumpe2fs,e2fsck,e2image,e2undo,findfs,fsck,\
-        rm /usr/bin/"${i}"
+logsave,mkfs.ext2,resize2fs,chattr,lsattr,e2freefrag,filefrag,jfs_debugfs,jfs_fsck,\
-    done
+jfs_fscklog,jfs_logdump,jfs_mkfs,jfs_tune,mkfs.xfs,xfs_copy,xfs_db,xfs_estimate,\
+xfs_fsr,xfs_io,xfs_logprint,xfs_mdrestore,xfs_repair,xfs_rtcp,mkdosfs,dosfsck,dosfslabel,\
+fatlabel,mount.smb3,mount.cifs,fsck.ext2,fsck.ext3,fsck.ext4,e2label,tune2fs,mkfs.ext3,\
+mkfs.ext4,mke2fs,fsck.jfs,mkfs.jfs,wipefs,btrfs-find-root,btrfs-image,btrfs-map-logical,\
+btrfs-select-super,btrfstune,mkfs.nilfs2,mount.nilfs2,nilfs_cleanerd,cifs.upcall,cifscreds,\
+getcifsacl,setcifsacl,smb2-quota,smbinfo,umount.nilfs2,chcp,dumpseg,lscp,lssu,mkcp,rmcp,\
+fsck.cramfs,fsck.minix,fsfreeze,fstrim,mkfs.bfs,mkfs.cramfs,mkfs.minix,mkfs.f2fs,fsck.exfat,\
+mkfs.exfat,tune.exfat,exfatlabel,dump.exfat,fatresize,nvme,,fsck.msdos,fsck.vfat,mkfs.vfat,\
+mkfs.msdos,fsck.btrfs,e2mmpstatus,e2scrub,e2scrub_all,e4crypt,e4defrag,defrag.f2fs,dump.f2fs,\
+f2fs_io,f2fscrypt,fibmap.f2fs,resize.f2fs,sload.f2fs,fsck.f2fs,parse.f2fs,blkmapd,nfsconf,\
+nfsdcld,nfsdclddb,nfsdclnts,nfsidmap,nfsv4.exportd,nilfs-clean,nilfs-resize,nilfs-tune,\
+xfs_growfs,xfs_quota,xfs_spaceman,compile_et,mk_cmds,fsck.xfs,xfs_admin,xfs_bmap,xfs_freeze,\
+xfs_info,xfs_metadump,xfs_mkfile,xfs_ncheck}
 }
 
 # vim: set ft=sh ts=4 sw=4 et:

usr/lib/archboot/cpio/hooks/net_cleanup

@@ -5,13 +5,9 @@
 _run ()
 {
     ! grep -qw 'archboot' /etc/hostname && return
-    _APPS="arping clockdiff tracepath ssh arpd \
-      genl ifstat ctstat rtstat lnstat nstat rtacct rtmon ss tc \
-      bridge dcb devlink rdma tipc vdpa ethtool elinks brctl"
     _install_files
-    for i in ${_APPS}; do
+    rm /usr/bin/{arping,clockdiff,tracepath,ssh,arpd,genl,ifstat,ctstat,rtstat,lnstat,\
-        rm /usr/bin/"${i}"
+nstat,rtacct,rtmon,ss,tc,bridge,dcb,devlink,rdma,tipc,vdpa,ethtool,elinks,brctl}
-    done
 }
 
 # vim: set ft=sh ts=4 sw=4 et: