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

move base parts to base_common

Browse source
This commit is contained in:
Tobias Powalowski 2022-01-31 10:49:49 +01:00
parent bcaa924852
commit bb634db4d4
8 changed files with 268 additions and 440 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/archboot/aarch64-latest.conf
View file

@ -10,8 +10,8 @@ FILES=()
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # Please change the hooks only if you know what you are doing.
HOOKS=(udev keyboard archboot_kms archboot_base_latest archboot_installer_latest archboot_net_latest \ HOOKS=(udev keyboard archboot_kms archboot_base_common archboot_base_latest archboot_installer_latest \
archboot_kexec archboot_licenses) archboot_net_latest archboot_kexec archboot_licenses)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression # Use this to compress the initramfs image. By default, gzip compression

21
etc/archboot/aarch64.conf
View file

@ -10,17 +10,16 @@ FILES=()
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # Please change the hooks only if you know what you are doing.
HOOKS=(archboot_kms udev archboot_base archboot_installer archboot_tz archboot_keymap \ HOOKS=(archboot_kms udev archboot_base_common archboot_base archboot_installer archboot_tz \
archboot_acpi archboot_motd \ archboot_keymap archboot_acpi archboot_motd archboot_hwdetect block archboot_net keyboard \
archboot_hwdetect block archboot_net \ dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt btrfs \
keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \ archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \
encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \ archboot_pppoe archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils archboot_openvpn \
archboot_pppoe archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless \
archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ archboot_wireless_staging archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim \
archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \ archboot_wipe archboot_testdisk archboot_ddrescue archboot_nmap archboot_tcpdump archboot_openconnect \
archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \ archboot_dnsmasq archboot_platform archboot_hypervisor archboot_wvdial archboot_usb_modeswitch \
archboot_hypervisor archboot_wvdial \ archboot_secure_boot archboot_efivar archboot_lshw)
archboot_usb_modeswitch archboot_secure_boot archboot_efivar archboot_lshw)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression # Use this to compress the initramfs image. By default, gzip compression

4
etc/archboot/x86_64-latest.conf
View file

@ -10,8 +10,8 @@ FILES=()
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # Please change the hooks only if you know what you are doing.
HOOKS=(udev keyboard archboot_kms archboot_base_latest archboot_installer_latest archboot_net_latest \ HOOKS=(udev keyboard archboot_kms archboot_base_common archboot_base_latest \
archboot_kexec archboot_licenses) archboot_installer_latest archboot_net_latest archboot_kexec archboot_licenses)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression # Use this to compress the initramfs image. By default, gzip compression

22
etc/archboot/x86_64.conf
View file

@ -10,17 +10,17 @@ FILES=()
# SETUP # SETUP
# #
# Please change the hooks only if you know what you are doing. # Please change the hooks only if you know what you are doing.
HOOKS=(archboot_kms udev archboot_base archboot_installer archboot_tz archboot_keymap \ HOOKS=(archboot_kms udev archboot_base_common archboot_base archboot_installer \
archboot_acpi archboot_motd archboot_intel_wireless \ archboot_tz archboot_keymap archboot_acpi archboot_motd archboot_intel_wireless \
archboot_hwdetect block archboot_pcspkr archboot_net \ archboot_hwdetect block archboot_pcspkr archboot_net keyboard dmraid archboot_devicemapper \
keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \ archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt btrfs archboot_filesystems archboot_remote \
encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \ archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd archboot_pppoe archboot_grub \
archboot_pppoe archboot_grub archboot_refind archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_refind archboot_efibootmgr archboot_pciutils archboot_usbutils archboot_openvpn \
archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless \
archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \ archboot_wireless_staging archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim \
archboot_chntpw archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \ archboot_wipe archboot_testdisk archboot_ddrescue archboot_chntpw archboot_nmap archboot_tcpdump \
archboot_hypervisor archboot_dmidecode archboot_wvdial \ archboot_openconnect archboot_dnsmasq archboot_platform archboot_hypervisor archboot_dmidecode \
archboot_usb_modeswitch archboot_secure_boot archboot_efivar archboot_lshw) archboot_wvdial archboot_usb_modeswitch archboot_secure_boot archboot_efivar archboot_lshw)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression # Use this to compress the initramfs image. By default, gzip compression

233
usr/lib/initcpio/install/archboot_base
View file

@ -3,36 +3,25 @@
build () build ()
{ {
### setting up base structure apps="getent head id cksum tail tee test tr uptime w who which whoami xargs \
add_dir "/mnt" swapon uniq cut seq snarf sort fdisk sfdisk cfdisk parted free less \
add_dir "/install" chgrp chown date df dialog dmesg egrep fgrep stty sync tar bsdcpio hdparm \
add_dir "/var/log" mktemp chroot dirname expr bzip2 hwclock su cpio dd gzip top sdparm tput \
add_dir "/home" ifconfig ln losetup mkfifo mknod readlink lzmadec lzop xz last wall mesg utmpdump \
xzdec switch_root pivot_root chcpu ctrlaltdel raw gdisk sgdisk cgdisk fixparts findmnt \
add_symlink /var/run ../run
add_symlink /var/lock ../run/lock
apps="init getent agetty mount umount basename du clear env head id cksum nano printf tail \
tee test tr tty uptime w who wc which whoami xargs yes \
bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted partprobe \
gawk cp mv free ls rm sed less chgrp chmod chown date df dialog dmesg egrep fgrep grep \
kill killall more ps pwd rmdir stty sync tar bsdtar bsdcpio touch uname hdparm \
true mktemp chroot dirname expr bzip2 hwclock su cat cpio dd gzip wget top sdparm tput \
ifconfig ln losetup mkdir mkfifo mknod readlink echo dir lzmadec lzop xz last wall mesg utmpdump \
xzdec switch_root false pivot_root sleep chcpu ctrlaltdel raw gdisk sgdisk cgdisk fixparts findmnt \
lsblk swaplabel cal chrt col colcrt colrm column fallocate flock getopt hexdump \ lsblk swaplabel cal chrt col colcrt colrm column fallocate flock getopt hexdump \
ionice ipcmk ipcrm ipcs isosize swapoff look lscpu mcookie namei \ ionice ipcmk ipcrm ipcs isosize swapoff look lscpu mcookie namei prlimit rename \
prlimit rename renice rev script scriptreplay setarch setsid setterm taskset ul unshare \ renice rev script scriptreplay setarch setsid setterm taskset ul unshare \
uuidgen whereis write addpart delpart ldattach partx readprofile rtcwake uuidd \ uuidgen whereis write addpart delpart ldattach partx readprofile rtcwake uuidd \
sysctl pgrep pkill pmap pwdx slabtop tload vmstat watch file eject keyctl request-key \ sysctl pgrep pkill pmap pwdx slabtop tload vmstat watch file eject keyctl request-key \
kmod zsh hostname tac sulogin resizepart lslocks wdctl zless zgrep fold od ldd pidof \ zsh hostname tac sulogin resizepart lslocks wdctl zless zgrep fold od ldd \
shred blockdev blkdiscard newgrp nsenter runuser vipw ldconfig diff depmod awk halt \ shred blockdev blkdiscard newgrp nsenter runuser vipw ldconfig diff depmod \
shutdown reboot poweroff insmod linux32 linux64 lsmod lzcat lzcmp lzdiff lzegrep lzfgrep \ linux32 linux64 lsmod lzcat lzcmp lzdiff lzegrep lzfgrep lzgrep lzegrep lzfgrep \
lzgrep lzegrep lzfgrep lzgrep lzless lzmore lzma modinfo modprobe nc reset rmmod \ lzgrep lzless lzmore lzma modinfo nc reset rmmod unlzma unxz xzcat lastb stat \
unlzma unxz xzcat lastb sh stat blkzone chmem choom fincore hardlink irqtop lsipc lsirq \ blkzone chmem choom fincore hardlink irqtop lsipc lsirq lslogins lsmem lsns mkfs \
lslogins lsmem lsns mkfs scriptlive setpriv uclampset uname26 uuidparse zramctl [ b2sum \ scriptlive setpriv uclampset uname26 uuidparse zramctl [ b2sum base32 base64 \
base32 base64 basenc chcon comm csplit dircolors expand factor fmt hostid install join \ basenc chcon comm csplit dircolors expand factor fmt hostid install join link \
link logname md5sum 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 sum timeout truncate \ runcon sha1sum sha224sum sha256sum sha384sum sha512sum shuf split stdbuf sum timeout truncate \
tsort unexpand unlink users vdir pwait fuser peekfd prtstat pslog pstree newgidmap newuidmap \ tsort unexpand unlink users vdir pwait fuser peekfd prtstat pslog pstree newgidmap newuidmap \
lzmainfo xzcmp xzegrep xzfgrep gzexe uncompress zcmp zdiff zegrep zfgrep zforce zmore znew \ lzmainfo xzcmp xzegrep xzfgrep gzexe uncompress zcmp zdiff zegrep zfgrep zforce zmore znew \
@ -44,8 +33,6 @@ build ()
for i in $apps; do for i in $apps; do
add_binary "$i" add_binary "$i"
done done
add_file "/usr/lib/libkmod.so"
add_symlink "/init" "/usr/lib/systemd/systemd"
### add zsh ### add zsh
add_full_dir "/etc/zsh" add_full_dir "/etc/zsh"
add_full_dir "/usr/share/zsh" add_full_dir "/usr/share/zsh"
@ -54,195 +41,21 @@ build ()
### add en_US.utf8 locale ### add en_US.utf8 locale
add_file "/usr/lib/locale/locale-archive" add_file "/usr/lib/locale/locale-archive"
### adding needed files from running system
add_symlink "/etc/mtab" "/proc/self/mounts"
add_file "/usr/share/terminfo/l/linux"
add_full_dir "/etc/profile.d"
systemfiles="bash.bashrc bash.bash_logout crypttab fstab host.conf hosts inputrc mke2fs.conf \
nanorc nsswitch.conf protocols request-key.conf resolv.conf securetty \
services wgetrc"
for i in $systemfiles; do
add_file "/etc/$i"
done
### add nano files
add_full_dir /usr/share/nano
### adding config files of installation system ### adding config files of installation system
for i in $(find /usr/share/archboot/base/etc/* ! -type d); do for i in $(find /usr/share/archboot/base/etc/* ! -type d); do
add_file "$i" "$(echo $i | sed -e 's#/usr/share/archboot/base##g')" add_file "$i" "$(echo $i | sed -e 's#/usr/share/archboot/base##g')"
done done
add_file "/etc/profile"
add_file "/etc/group"
add_file "/etc/gshadow"
### add kmod related config file(s) ### fix file
add_file "/usr/lib/depmod.d/search.conf" add_file "/usr/share/file/misc/magic.mgc"
### fixing network support
add_file "/lib/libnss_files.so.2"
add_file "/lib/libnss_dns.so.2"
### add copy-mountpoint.sh
add_file "/usr/bin/archboot-copy-mountpoint.sh"
### add rsync-backup.sh
add_file "/usr/bin/archboot-rsync-backup.sh"
### add binary add_check
add_file "/usr/bin/archboot-binary-check.sh"
### add pam
apps="mkhomedir_helper pam_timestamp_check unix_chkpwd unix_update"
for i in $apps; do
add_binary "$i"
done
add_full_dir "/etc/security"
add_full_dir "/etc/default"
add_full_dir "/etc/pam.d"
add_file "/etc/environment"
add_full_dir "/usr/lib/security"
#fix cracklib support!
add_file /usr/lib/libcrack.so.2
### add shadow ### add shadow
apps="groups login nologin chage chfn chsh expiry faillog gpasswd lastlog passwd \ apps="groups chage chfn chsh expiry faillog gpasswd lastlog passwd \
chgpasswd chpasswd groupadd groupdel groupmems groupmod grpck grpconv grpunconv \ chgpasswd chpasswd groupadd groupdel groupmems groupmod grpck grpconv grpunconv \
newusers pwck pwconv pwunconv useradd userdel usermod sg vigr" newusers pwck pwconv pwunconv useradd userdel usermod sg vigr"
for i in $apps; do for i in $apps; do
add_binary "$i" add_binary "$i"
done done
add_file "/etc/login.defs"
### add virtio modules
add_checked_modules 'virtio'
### add systemd
# add systemd kernel modules
add_checked_modules 'nfs|autofs4|loop'
apps="mount.nfs setfont loadkeys"
for i in $apps; do
add_binary "$i"
done
# add firmware files
add_full_dir /lib/firmware
#dbus files
apps="dbus-cleanup-sockets dbus-daemon dbus-launch dbus-monitor dbus-run-session dbus-send dbus-test-tool \
dbus-update-activation-environment dbus-uuidgen"
for i in $apps; do
add_binary "$i"
done
add_binary "/usr/lib/dbus-1.0/dbus-daemon-launch-helper"
add_dir "/var/lib/dbus"
add_full_dir "/etc/dbus-1"
add_full_dir "/usr/share/dbus-1"
#systemd files
apps="busctl bootctl coredumpctl hostnamectl journalctl kernel-install localectl \
loginctl machinectl networkctl systemctl 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-tmpfiles \
systemd-tty-ask-password-agent timedatectl systemd-repart userdbctl homectl oomctl portablectl systemd-creds \
systemd-cryptenroll systemd-dissect systemd-id128 systemd-sysext systemd-umount"
for i in $apps; do
add_binary "$i"
done
add_dir "/etc/tmpfiles.d"
add_dir "/etc/modules-load.d"
add_dir "/etc/binfmt.d/"
add_full_dir "/etc/sysctl.d/"
add_file "/usr/lib/os-release"
add_full_dir "/etc/systemd"
add_full_dir "/etc/xdg"
add_full_dir "/usr/lib/systemd"
add_full_dir "/usr/share/systemd"
add_full_dir "/usr/share/factory"
add_full_dir "/usr/share/polkit-1"
add_full_dir "/usr/lib/tmpfiles.d"
add_full_dir "/usr/lib/modules-load.d"
add_dir "/var/lib/systemd"
add_file "/usr/share/archboot/base/etc/locale.conf" "/etc/locale.conf"
add_file "/usr/share/archboot/base/etc/vconsole.conf" "/etc/vconsole.conf"
add_file "/usr/share/archboot/base/etc/systemd/system/getty@.service" "/etc/systemd/system/getty@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/local-fs.target.wants/var-tmp.mount" \
"/usr/lib/systemd/system/var-tmp.mount"
add_symlink "/etc/systemd/system/local-fs.target.wants/var-tmp.mount" "/usr/lib/systemd/system/var-tmp.mount"
add_file "/usr/share/archboot/base/etc/systemd/system/serial-getty@.service" "/etc/systemd/system/serial-getty@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/autovt@.service" "/etc/systemd/system/autovt@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/getty.target.wants/getty@tty1.service" \
"/usr/lib/systemd/system/getty@tty1.service"
add_symlink "/etc/systemd/system/getty.target.wants/getty@tty1.service" "/usr/lib/systemd/system/getty@tty1.service"
add_file "/usr/share/archboot/base/etc/machine-id" "/etc/machine-id"
### add missing libsystemd files
add_file "/usr/lib/libnss_myhostname.so.2"
add_file "/usr/lib/libnss_mymachines.so.2"
add_file "/usr/lib/libnss_resolve.so.2"
add_file "/usr/lib/libnss_systemd.so.2"
### fix tmpfiles startup
add_file "/usr/lib/libnss_compat.so.2"
add_file "/usr/lib/libnsl.so.1"
## fix for systemd >=245 set default target
add_symlink "/etc/systemd/system/initrd.target" "/usr/lib/systemd/system/multi-user.target"
### add udev, which is not covered by udev hook
add_binary "logger"
# add rule files
add_full_dir "/usr/lib/udev"
# add schedule rules file
add_file "/usr/share/archboot/base/etc/udev/rules.d/60-ioschedulers.rules" "/etc/udev/rules.d/60-ioschedulers.rules"
# add swapiness sysctl config file
add_file "/usr/share/archboot/base/etc/sysctl.d/99-sysctl.conf" "/etc/sysctl.d/99-sysctl.conf"
### add pacman
apps="pacman pacman-conf pacman-key pacman-db-upgrade makepkg \
repo-add repo-elephant testpkg vercmp curl gpg-agent haveged gpg repo-remove"
for i in $apps; do
add_binary "$i"
done
add_dir "/var/cache/pacman/pkg"
add_dir "/var/lib/pacman"
add_file "/etc/pacman.conf"
add_file "/etc/makepkg.conf"
add_file "/etc/pacman.d/mirrorlist"
# add pacman initialisation of gpg keys
add_file "/usr/share/archboot/pacman/etc/systemd/system/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
add_symlink "/etc/systemd/system/multi-user.target.wants/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
if [[ "$(uname -m)" == "x86_64" ]]; then
add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init.service" "/etc/systemd/system/pacman-init.service"
add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init.service" "/etc/systemd/system/pacman-init.service"
fi
if [[ "$(uname -m)" == "aarch64" ]]; then
add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
fi
add_full_dir "/usr/share/pacman/keyrings"
add_full_dir "/usr/share/makepkg"
# add local installed pacman database in container mode
if [[ -e "/etc/hostname" ]]; then
[[ "$(cat /etc/hostname )" == "archboot" ]] && add_full_dir "/var/lib/pacman/local"
else
add_full_dir "/var/lib/pacman/local"
fi
### fix file
add_file "/usr/share/file/misc/magic.mgc"
### add ca certificates
cafile="tls-ca-bundle.pem"
cert="cert.pem"
cert2="ca-certificates.crt"
ca_dir="/etc/ca-certificates/extracted"
cert_dir="/etc/ssl"
cert2_dir="/etc/ssl/certs"
add_full_dir "$ca_dir"
add_full_dir "$cert2_dir"
add_symlink "${cert_dir}/${cert}" "../ca-certificates/extracted/$cafile"
add_symlink "${cert2_dir}/${cert2}" "../../ca-certificates/extracted/$cafile"
### fix licenses ### fix licenses
add_file "/usr/share/licenses/file/COPYING" add_file "/usr/share/licenses/file/COPYING"
@ -250,19 +63,13 @@ build ()
add_file "/usr/share/licenses/hdparm/LICENSE.TXT" add_file "/usr/share/licenses/hdparm/LICENSE.TXT"
add_file "/usr/share/licenses/ncurses/COPYING" add_file "/usr/share/licenses/ncurses/COPYING"
add_file "/usr/share/licenses/pcre/LICENSE" add_file "/usr/share/licenses/pcre/LICENSE"
add_file "/usr/share/licenses/shadow/LICENSE"
add_file "/usr/share/licenses/sdparm/LICENSE" add_file "/usr/share/licenses/sdparm/LICENSE"
add_file "/usr/share/licenses/zlib/LICENSE" add_file "/usr/share/licenses/zlib/LICENSE"
add_file "/usr/share/licenses/iana-etc/LICENSE"
add_file "/usr/share/licenses/dbus/COPYING"
} }
help () help ()
{ {
cat <<HELPEOF cat <<HELPEOF
This hook sets up all initial directories and installs base, kmod, This hook sets up base for a normal archboot image.
pam, pacman, shadow, systemd, udev utilities and libraries
for a archboot image.
DO NOT remove this one unless you know what you're doing.
HELPEOF HELPEOF
} }

215
usr/lib/initcpio/install/archboot_base_common Normal file
View file

@ -0,0 +1,215 @@
#!/usr/bin/env bash
# Created by Tobias Powalowski <tpowa@archlinux.org>
build ()
{
### setting up base structure
add_dir "/mnt"
add_dir "/install"
add_dir "/var/log"
add_dir "/home"
add_symlink /var/run ../run
add_symlink /var/lock ../run/lock
### add basic apps
apps="init agetty basename mount umount clear env printf gawk tty bash partprobe cp dir du ls mv rm sed grep \
kill killall more ps pwd rmdir true cat mkdir echo false sleep kmod pidof touch chmod \
find wc wget uname bsdtar yes awk halt shutdown reboot poweroff insmod modprobe sh"
for i in $apps; do
add_binary "$i"
done
### add nano files
add_full_dir /usr/share/nano
add_file "/usr/lib/libkmod.so"
add_symlink "/init" "/usr/lib/systemd/systemd"
### adding needed files from running system
add_symlink "/etc/mtab" "/proc/self/mounts"
add_file "/usr/share/terminfo/l/linux"
add_full_dir "/etc/profile.d"
systemfiles="bash.bashrc bash.bash_logout crypttab fstab host.conf hosts inputrc mke2fs.conf \
nanorc nsswitch.conf protocols request-key.conf resolv.conf securetty \
services wgetrc"
for i in $systemfiles; do
add_file "/etc/$i"
done
### adding config files of installation system
add_file "/etc/profile"
add_file "/etc/group"
add_file "/etc/gshadow"
### add kmod related config file(s)
add_file "/usr/lib/depmod.d/search.conf"
### fixing network support
add_file "/lib/libnss_files.so.2"
add_file "/lib/libnss_dns.so.2"
### add pam
apps="mkhomedir_helper pam_timestamp_check unix_chkpwd unix_update"
for i in $apps; do
add_binary "$i"
done
add_full_dir "/etc/security"
add_full_dir "/etc/default"
add_full_dir "/etc/pam.d"
add_file "/etc/environment"
add_full_dir "/usr/lib/security"
#fix cracklib support!
add_file /usr/lib/libcrack.so.2
### add shadow
apps="login nologin"
for i in $apps; do
add_binary "$i"
done
add_file "/etc/login.defs"
### add virtio modules
add_checked_modules 'virtio'
### add systemd
# add systemd kernel modules
add_checked_modules 'nfs|autofs4|loop'
apps="mount.nfs setfont loadkeys"
for i in $apps; do
add_binary "$i"
done
# add firmware files
add_full_dir /lib/firmware
#dbus files
apps="dbus-cleanup-sockets dbus-daemon dbus-launch dbus-monitor dbus-run-session dbus-send dbus-test-tool \
dbus-update-activation-environment dbus-uuidgen"
for i in $apps; do
add_binary "$i"
done
add_binary "/usr/lib/dbus-1.0/dbus-daemon-launch-helper"
add_dir "/var/lib/dbus"
add_full_dir "/etc/dbus-1"
add_full_dir "/usr/share/dbus-1"
#systemd files
apps="busctl bootctl coredumpctl hostnamectl journalctl kernel-install localectl \
loginctl machinectl networkctl systemctl 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-tmpfiles \
systemd-tty-ask-password-agent timedatectl systemd-repart userdbctl homectl oomctl portablectl systemd-creds \
systemd-cryptenroll systemd-dissect systemd-id128 systemd-sysext systemd-umount"
for i in $apps; do
add_binary "$i"
done
add_dir "/etc/tmpfiles.d"
add_dir "/etc/modules-load.d"
add_dir "/etc/binfmt.d/"
add_full_dir "/etc/sysctl.d/"
add_file "/usr/lib/os-release"
add_full_dir "/etc/systemd"
add_full_dir "/etc/xdg"
add_full_dir "/usr/lib/systemd"
add_full_dir "/usr/share/systemd"
add_full_dir "/usr/share/factory"
add_full_dir "/usr/share/polkit-1"
add_full_dir "/usr/lib/tmpfiles.d"
add_full_dir "/usr/lib/modules-load.d"
add_dir "/var/lib/systemd"
add_file "/usr/share/archboot/base/etc/locale.conf" "/etc/locale.conf"
add_file "/usr/share/archboot/base/etc/vconsole.conf" "/etc/vconsole.conf"
add_file "/usr/share/archboot/base/etc/systemd/system/getty@.service" "/etc/systemd/system/getty@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/local-fs.target.wants/var-tmp.mount" \
"/usr/lib/systemd/system/var-tmp.mount"
add_symlink "/etc/systemd/system/local-fs.target.wants/var-tmp.mount" "/usr/lib/systemd/system/var-tmp.mount"
add_file "/usr/share/archboot/base/etc/systemd/system/serial-getty@.service" "/etc/systemd/system/serial-getty@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/autovt@.service" "/etc/systemd/system/autovt@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/getty.target.wants/getty@tty1.service" \
"/usr/lib/systemd/system/getty@tty1.service"
add_symlink "/etc/systemd/system/getty.target.wants/getty@tty1.service" "/usr/lib/systemd/system/getty@tty1.service"
add_file "/usr/share/archboot/base/etc/machine-id" "/etc/machine-id"
### add missing libsystemd files
add_file "/usr/lib/libnss_myhostname.so.2"
add_file "/usr/lib/libnss_mymachines.so.2"
add_file "/usr/lib/libnss_resolve.so.2"
add_file "/usr/lib/libnss_systemd.so.2"
### fix tmpfiles startup
add_file "/usr/lib/libnss_compat.so.2"
add_file "/usr/lib/libnsl.so.1"
## fix for systemd >=245 set default target
add_symlink "/etc/systemd/system/initrd.target" "/usr/lib/systemd/system/multi-user.target"
### add udev, which is not covered by udev hook
add_binary "logger"
# add rule files
add_full_dir "/usr/lib/udev"
# add schedule rules file
add_file "/usr/share/archboot/base/etc/udev/rules.d/60-ioschedulers.rules" "/etc/udev/rules.d/60-ioschedulers.rules"
# add swapiness sysctl config file
add_file "/usr/share/archboot/base/etc/sysctl.d/99-sysctl.conf" "/etc/sysctl.d/99-sysctl.conf"
### add pacman
apps="pacman pacman-conf pacman-key pacman-db-upgrade makepkg \
repo-add repo-elephant testpkg vercmp curl gpg-agent haveged gpg repo-remove"
for i in $apps; do
add_binary "$i"
done
add_dir "/var/cache/pacman/pkg"
add_dir "/var/lib/pacman"
add_file "/etc/pacman.conf"
add_file "/etc/makepkg.conf"
add_file "/etc/pacman.d/mirrorlist"
# add pacman initialisation of gpg keys
add_file "/usr/share/archboot/pacman/etc/systemd/system/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
add_symlink "/etc/systemd/system/multi-user.target.wants/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
if [[ "$(uname -m)" == "x86_64" ]]; then
add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init.service" "/etc/systemd/system/pacman-init.service"
add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init.service" "/etc/systemd/system/pacman-init.service"
fi
if [[ "$(uname -m)" == "aarch64" ]]; then
add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
fi
add_full_dir "/usr/share/pacman/keyrings"
add_full_dir "/usr/share/makepkg"
# add local installed pacman database in container mode
if [[ -e "/etc/hostname" ]]; then
[[ "$(cat /etc/hostname )" == "archboot" ]] && add_full_dir "/var/lib/pacman/local"
else
add_full_dir "/var/lib/pacman/local"
fi
### add ca certificates
cafile="tls-ca-bundle.pem"
cert="cert.pem"
cert2="ca-certificates.crt"
ca_dir="/etc/ca-certificates/extracted"
cert_dir="/etc/ssl"
cert2_dir="/etc/ssl/certs"
add_full_dir "$ca_dir"
add_full_dir "$cert2_dir"
add_symlink "${cert_dir}/${cert}" "../ca-certificates/extracted/$cafile"
add_symlink "${cert2_dir}/${cert2}" "../../ca-certificates/extracted/$cafile"
### fix licenses
add_file "/usr/share/licenses/shadow/LICENSE"
add_file "/usr/share/licenses/iana-etc/LICENSE"
add_file "/usr/share/licenses/dbus/COPYING"
}
help ()
{
cat <<HELPEOF
This hook sets up all common initial directories and installs base, kmod,
pam, pacman, shadow, systemd, udev utilities and libraries
for a archboot image.
DO NOT remove this one unless you know what you're doing.
HELPEOF
}

201
usr/lib/initcpio/install/archboot_base_latest
View file

@ -3,215 +3,16 @@
build () build ()
{ {
### setting up base structure
add_dir "/mnt"
add_dir "/install"
add_dir "/var/log"
add_dir "/home"
add_symlink /var/run ../run
add_symlink /var/lock ../run/lock
apps="init agetty basename mount umount clear env printf gawk tty bash partprobe cp dir du ls mv rm sed grep \
kill killall more ps pwd rmdir true cat mkdir echo false sleep kmod pidof touch chmod \
find wc nano wget uname bsdtar yes awk halt shutdown reboot poweroff insmod modprobe sh"
for i in $apps; do
add_binary "$i"
done
add_file "/usr/lib/libkmod.so"
add_symlink "/init" "/usr/lib/systemd/systemd"
### adding needed files from running system
add_symlink "/etc/mtab" "/proc/self/mounts"
add_file "/usr/share/terminfo/l/linux"
add_full_dir "/etc/profile.d"
systemfiles="bash.bashrc bash.bash_logout fstab host.conf hosts inputrc \
nanorc nsswitch.conf protocols request-key.conf resolv.conf securetty \
wgetrc services"
for i in $systemfiles; do
add_file "/etc/$i"
done
### add nano files
add_full_dir /usr/share/nano
### adding config files of installation system ### adding config files of installation system
for i in $(find /usr/share/archboot/base/etc/* ! -type d ! -name passwd); do for i in $(find /usr/share/archboot/base/etc/* ! -type d ! -name passwd); do
add_file "$i" "$(echo $i | sed -e 's#/usr/share/archboot/base##g')" add_file "$i" "$(echo $i | sed -e 's#/usr/share/archboot/base##g')"
done done
add_file "/usr/share/archboot/installer_latest/etc/passwd" "/etc/passwd" add_file "/usr/share/archboot/installer_latest/etc/passwd" "/etc/passwd"
add_file "/etc/profile"
add_file "/etc/group"
add_file "/etc/gshadow"
### add kmod related config file(s)
add_file "/usr/lib/depmod.d/search.conf"
### fixing network support
add_file "/lib/libnss_files.so.2"
add_file "/lib/libnss_dns.so.2"
### add pam
apps="mkhomedir_helper pam_timestamp_check unix_chkpwd unix_update"
for i in $apps; do
add_binary "$i"
done
add_full_dir "/etc/security"
add_full_dir "/etc/default"
add_full_dir "/etc/pam.d"
add_file "/etc/environment"
add_full_dir "/usr/lib/security"
#fix cracklib support!
add_file /usr/lib/libcrack.so.2
### add shadow
apps="login nologin"
for i in $apps; do
add_binary "$i"
done
add_file "/etc/login.defs"
### add virtio modules
add_checked_modules 'virtio'
#dbus files
apps="dbus-cleanup-sockets dbus-daemon dbus-launch dbus-monitor dbus-run-session dbus-send dbus-test-tool \
dbus-update-activation-environment dbus-uuidgen"
for i in $apps; do
add_binary "$i"
done
add_binary "/usr/lib/dbus-1.0/dbus-daemon-launch-helper"
add_dir "/var/lib/dbus"
add_full_dir "/etc/dbus-1"
add_full_dir "/usr/share/dbus-1"
### add systemd
# add systemd kernel modules
add_checked_modules 'nfs|autofs4|loop'
apps="mount.nfs setfont loadkeys"
for i in $apps; do
add_binary "$i"
done
#systemd files
apps="busctl bootctl coredumpctl hostnamectl journalctl kernel-install localectl \
loginctl machinectl networkctl systemctl 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-tmpfiles \
systemd-tty-ask-password-agent timedatectl systemd-repart userdbctl"
for i in $apps; do
add_binary "$i"
done
add_dir "/etc/tmpfiles.d"
add_dir "/etc/modules-load.d"
add_dir "/etc/binfmt.d/"
add_full_dir "/etc/sysctl.d/"
add_file "/usr/lib/os-release"
add_full_dir "/etc/systemd"
add_full_dir "/etc/xdg"
add_full_dir "/usr/lib/systemd"
add_full_dir "/usr/share/systemd"
add_full_dir "/usr/share/factory"
add_full_dir "/usr/share/polkit-1"
add_full_dir "/usr/lib/tmpfiles.d"
add_full_dir "/usr/lib/modules-load.d"
add_dir "/var/lib/systemd"
add_file "/usr/share/archboot/base/etc/locale.conf" "/etc/locale.conf"
add_file "/usr/share/archboot/base/etc/vconsole.conf" "/etc/vconsole.conf"
add_file "/usr/share/archboot/base/etc/systemd/system/getty@.service" "/etc/systemd/system/getty@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/local-fs.target.wants/var-tmp.mount" \
"/usr/lib/systemd/system/var-tmp.mount"
add_symlink "/etc/systemd/system/local-fs.target.wants/var-tmp.mount" "/usr/lib/systemd/system/var-tmp.mount"
add_file "/usr/share/archboot/base/etc/systemd/system/serial-getty@.service" "/etc/systemd/system/serial-getty@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/autovt@.service" "/etc/systemd/system/autovt@.service"
add_file "/usr/share/archboot/base/etc/systemd/system/getty.target.wants/getty@tty1.service" \
"/usr/lib/systemd/system/getty@tty1.service"
add_symlink "/etc/systemd/system/getty.target.wants/getty@tty1.service" "/usr/lib/systemd/system/getty@tty1.service"
add_file "/usr/share/archboot/base/etc/machine-id" "/etc/machine-id"
### add missing libsystemd files
add_file "/usr/lib/libnss_myhostname.so.2"
add_file "/usr/lib/libnss_mymachines.so.2"
add_file "/usr/lib/libnss_resolve.so.2"
add_file "/usr/lib/libnss_systemd.so.2"
### fix tmpfiles startup
add_file "/usr/lib/libnss_compat.so.2"
add_file "/usr/lib/libnsl.so.1"
## fix for systemd >=245 set default target
add_symlink "/etc/systemd/system/initrd.target" "/usr/lib/systemd/system/multi-user.target"
### add udev, which is not covered by udev hook
add_binary "logger"
# add rule files
add_full_dir "/usr/lib/udev"
# add schedule rules file
add_file "/usr/share/archboot/base/etc/udev/rules.d/60-ioschedulers.rules" "/etc/udev/rules.d/60-ioschedulers.rules"
# add swapiness sysctl config file
add_file "/usr/share/archboot/base/etc/sysctl.d/99-sysctl.conf" "/etc/sysctl.d/99-sysctl.conf"
### add pacman
apps="pacman pacman-conf pacman-key pacman-db-upgrade makepkg \
repo-add repo-elephant testpkg vercmp curl gpg-agent haveged gpg repo-remove"
for i in $apps; do
add_binary "$i"
done
add_dir "/var/cache/pacman/pkg"
add_dir "/var/lib/pacman"
add_file "/etc/pacman.conf"
add_file "/etc/makepkg.conf"
add_file "/etc/pacman.d/mirrorlist"
# add pacman initialisation of gpg keys
add_file "/usr/share/archboot/pacman/etc/systemd/system/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
if [[ "$(uname -m)" == "x86_64" ]]; then
add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init.service" "/etc/systemd/system/pacman-init.service"
add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init.service" "/etc/systemd/system/pacman-init.service"
fi
if [[ "$(uname -m)" == "aarch64" ]]; then
add_file "/usr/share/archboot/pacman/etc/systemd/system/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
add_symlink "/etc/systemd/system/multi-user.target.wants/pacman-init-arm.service" "/etc/systemd/system/pacman-init-arm.service"
fi
add_symlink "/etc/systemd/system/multi-user.target.wants/etc-pacman.d-gnupg.mount" "/etc/systemd/system/etc-pacman.d-gnupg.mount"
add_full_dir "/usr/share/pacman/keyrings"
add_full_dir "/usr/share/makepkg"
# add local installed pacman database in container mode
if [[ -e "/etc/hostname" ]]; then
[[ "$(cat /etc/hostname )" == "archboot" ]] && add_full_dir "/var/lib/pacman/local"
else
add_full_dir "/var/lib/pacman/local"
fi
### fix file
add_file "/usr/share/file/misc/magic.mgc"
### add ca certificates
cafile="tls-ca-bundle.pem"
cert="cert.pem"
cert2="ca-certificates.crt"
ca_dir="/etc/ca-certificates/extracted"
cert_dir="/etc/ssl"
cert2_dir="/etc/ssl/certs"
add_full_dir "$ca_dir"
add_full_dir "$cert2_dir"
add_symlink "${cert_dir}/${cert}" "../ca-certificates/extracted/$cafile"
add_symlink "${cert2_dir}/${cert2}" "../../ca-certificates/extracted/$cafile"
### fix licenses
add_file "/usr/share/licenses/shadow/LICENSE"
add_file "/usr/share/licenses/iana-etc/LICENSE"
add_file "/usr/share/licenses/dbus/COPYING"
} }
help () help ()
{ {
cat <<HELPEOF cat <<HELPEOF
This hook sets up all initial directories and installs base, kmod, This hook sets up stripped down base for for latest image.
pam, pacman, shadow, systemd, udev utilities and libraries
for an archboot image, stripped down for latest image.
DO NOT remove this one unless you know what you're doing.
HELPEOF HELPEOF
} }

6
usr/lib/initcpio/install/archboot_installer
View file

@ -15,6 +15,12 @@ build ()
add_file "/usr/bin/archboot-restore-usbstick.sh" add_file "/usr/bin/archboot-restore-usbstick.sh"
add_binary "/usr/bin/isoinfo" add_binary "/usr/bin/isoinfo"
add_binary "/usr/bin/mktorrent" add_binary "/usr/bin/mktorrent"
### add copy-mountpoint.sh
add_file "/usr/bin/archboot-copy-mountpoint.sh"
### add rsync-backup.sh
add_file "/usr/bin/archboot-rsync-backup.sh"
### add binary add_check
add_file "/usr/bin/archboot-binary-check.sh"
# only include cachedir on booted archboot or container # only include cachedir on booted archboot or container
if [[ -e "/etc/hostname" ]]; then if [[ -e "/etc/hostname" ]]; then
[[ "$(cat /etc/hostname)" == "archboot" ]] && add_full_dir "/var/cache/pacman/pkg" [[ "$(cat /etc/hostname)" == "archboot" ]] && add_full_dir "/var/cache/pacman/pkg"