Date: Wednesday, March 7, 2018 @ 23:49:00 Author: heftig Revision: 318018
archrelease: copy trunk to testing-x86_64 Added: systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch (from rev 318017, systemd/trunk/0001-Use-Arch-Linux-device-access-groups.patch) systemd/repos/testing-x86_64/PKGBUILD (from rev 318017, systemd/trunk/PKGBUILD) systemd/repos/testing-x86_64/arch.conf (from rev 318017, systemd/trunk/arch.conf) systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 318017, systemd/trunk/initcpio-hook-udev) systemd/repos/testing-x86_64/initcpio-install-systemd (from rev 318017, systemd/trunk/initcpio-install-systemd) systemd/repos/testing-x86_64/initcpio-install-udev (from rev 318017, systemd/trunk/initcpio-install-udev) systemd/repos/testing-x86_64/loader.conf (from rev 318017, systemd/trunk/loader.conf) systemd/repos/testing-x86_64/splash-arch.bmp (from rev 318017, systemd/trunk/splash-arch.bmp) systemd/repos/testing-x86_64/systemd-binfmt.hook (from rev 318017, systemd/trunk/systemd-binfmt.hook) systemd/repos/testing-x86_64/systemd-catalog.hook (from rev 318017, systemd/trunk/systemd-catalog.hook) systemd/repos/testing-x86_64/systemd-daemon-reload.hook (from rev 318017, systemd/trunk/systemd-daemon-reload.hook) systemd/repos/testing-x86_64/systemd-hook (from rev 318017, systemd/trunk/systemd-hook) systemd/repos/testing-x86_64/systemd-hwdb.hook (from rev 318017, systemd/trunk/systemd-hwdb.hook) systemd/repos/testing-x86_64/systemd-sysctl.hook (from rev 318017, systemd/trunk/systemd-sysctl.hook) systemd/repos/testing-x86_64/systemd-sysusers.hook (from rev 318017, systemd/trunk/systemd-sysusers.hook) systemd/repos/testing-x86_64/systemd-tmpfiles.hook (from rev 318017, systemd/trunk/systemd-tmpfiles.hook) systemd/repos/testing-x86_64/systemd-udev-reload.hook (from rev 318017, systemd/trunk/systemd-udev-reload.hook) systemd/repos/testing-x86_64/systemd-update.hook (from rev 318017, systemd/trunk/systemd-update.hook) systemd/repos/testing-x86_64/systemd-user.pam (from rev 318017, systemd/trunk/systemd-user.pam) systemd/repos/testing-x86_64/systemd.install (from rev 318017, systemd/trunk/systemd.install) Deleted: systemd/repos/testing-x86_64/PKGBUILD systemd/repos/testing-x86_64/arch.conf systemd/repos/testing-x86_64/initcpio-hook-udev systemd/repos/testing-x86_64/initcpio-install-systemd systemd/repos/testing-x86_64/initcpio-install-udev systemd/repos/testing-x86_64/loader.conf systemd/repos/testing-x86_64/splash-arch.bmp systemd/repos/testing-x86_64/systemd-hwdb.hook systemd/repos/testing-x86_64/systemd-sysusers.hook systemd/repos/testing-x86_64/systemd-tmpfiles.hook systemd/repos/testing-x86_64/systemd-update.hook systemd/repos/testing-x86_64/systemd-user.pam systemd/repos/testing-x86_64/systemd.install ------------------------------------------------+ 0001-Use-Arch-Linux-device-access-groups.patch | 75 +++ PKGBUILD | 536 +++++++++++------------ arch.conf | 14 initcpio-hook-udev | 44 - initcpio-install-systemd | 396 ++++++++-------- initcpio-install-udev | 58 +- loader.conf | 2 systemd-binfmt.hook | 11 systemd-catalog.hook | 11 systemd-daemon-reload.hook | 11 systemd-hook | 31 + systemd-hwdb.hook | 22 systemd-sysctl.hook | 11 systemd-sysusers.hook | 22 systemd-tmpfiles.hook | 22 systemd-udev-reload.hook | 11 systemd-update.hook | 22 systemd-user.pam | 10 systemd.install | 198 ++++---- 19 files changed, 835 insertions(+), 672 deletions(-) Copied: systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch (from rev 318017, systemd/trunk/0001-Use-Arch-Linux-device-access-groups.patch) =================================================================== --- 0001-Use-Arch-Linux-device-access-groups.patch (rev 0) +++ 0001-Use-Arch-Linux-device-access-groups.patch 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,75 @@ +From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001 +Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Tue, 6 Mar 2018 23:39:47 +0100 +Subject: [PATCH] Use Arch Linux' device access groups +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + cdrom → optical + dialout → uucp + tape → storage +--- + rules/50-udev-default.rules.in | 14 +++++++------- + sysusers.d/basic.conf.in | 6 +++--- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in +index 191f56f42..f81c4d0fc 100644 +--- a/rules/50-udev-default.rules.in ++++ b/rules/50-udev-default.rules.in +@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" +-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" ++KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" + + SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" + +@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" + SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" + + SUBSYSTEM=="block", GROUP="disk" +-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom" +-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" +-KERNEL=="sch[0-9]*", GROUP="cdrom" +-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +-KERNEL=="pktcdvd", GROUP="cdrom" ++SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical" ++SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical" ++KERNEL=="sch[0-9]*", GROUP="optical" ++KERNEL=="pktcdvd[0-9]*", GROUP="optical" ++KERNEL=="pktcdvd", GROUP="optical" + +-SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" ++SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage" + SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" + KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" + KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" +diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in +index 8e358c02d..33e513a36 100644 +--- a/sysusers.d/basic.conf.in ++++ b/sysusers.d/basic.conf.in +@@ -24,14 +24,14 @@ g utmp - - - + + # Hardware access groups + g audio - - - +-g cdrom - - - +-g dialout - - - + g disk - - - + g input - - - + g kvm - - - + g lp - - - ++g optical - - - + g render - - - +-g tape - - - ++g storage - - - ++g uucp - - - + g video - - - + + # Default group for normal users +-- +2.16.2 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-03-07 23:46:30 UTC (rev 318017) +++ PKGBUILD 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,267 +0,0 @@ -# $Id$ -# Maintainer: Christian Hesse <m...@eworm.de> -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Maintainer: Tom Gundersen <t...@jklm.no> - -pkgbase=systemd -pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') -# latest commit on stable branch -_commit='738ab7502afb7663d9aacdd73e79025aa7cd0a9b' -# Bump this to latest major release for signed tag verification, -# the commit count is handled by pkgver() function. -pkgver=238.0 -pkgrel=1 -arch=('x86_64') -url="https://www.github.com/systemd/systemd" -makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' - 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' - 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' - 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git' - 'meson' 'libseccomp' 'pcre2') -options=('strip') -validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lenn...@poettering.net> - '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbys...@in.waw.pl> -source=('git://github.com/systemd/systemd-stable.git' - 'git://github.com/systemd/systemd.git' # pull in for tags, backports & reverts - 'initcpio-hook-udev' - 'initcpio-install-systemd' - 'initcpio-install-udev' - 'arch.conf' - 'loader.conf' - 'splash-arch.bmp' - 'systemd-user.pam' - 'systemd-hwdb.hook' - 'systemd-sysusers.hook' - 'systemd-tmpfiles.hook' - 'systemd-update.hook') -sha512sums=('SKIP' - 'SKIP' - 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '86d7cacd7536b1069c82bbbb08de7ec81e7f0f18a19fc2b06fabe90db4700623eb3540b75121080d325672d92e26912632ae4f93fd3c0bb48eb3e5eedd88352c' - 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' - '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' - 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' - '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' - 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' - '2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda' - '7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30' - 'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3' - '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618') - -_backports=( -) - -_reverts=( -) - -_validate_tag() { - local success fingerprint trusted status tag=v${pkgver%.*} - - parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1) - - if (( ! success )); then - error 'failed to validate tag %s\n' "$tag" - return 1 - fi - - if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then - error 'unknown or untrusted public key: %s\n' "$fingerprint" - return 1 - fi - - case $status in - 'expired') - warning 'the signature has expired' - ;; - 'expiredkey') - warning 'the key has expired' - ;; - esac - - return 0 -} - -pkgver() { - local version count - - cd "$pkgbase-stable" - - version="$(git describe --abbrev=0 --tags)" - count="$(git rev-list --count ${version}..)" - printf '%s.%s' "${version#v}" "${count}" -} - -prepare() { - cd "$pkgbase-stable" - - git remote add upstream ../systemd/ - git fetch --all - - git checkout "${_commit}" - - _validate_tag || return - - local _commit - for _commit in "${_backports[@]}"; do - git cherry-pick -n "$_commit" - done - for _commit in "${_reverts[@]}"; do - git revert -n "$_commit" - done -} - -build() { - local timeservers=({0..3}.arch.pool.ntp.org) - - local meson_options=( - -Daudit=false - -Dgnuefi=true - -Dima=false - -Dlz4=true - - -Ddbuspolicydir=/usr/share/dbus-1/system.d - -Ddefault-dnssec=no - # TODO(dreisner): consider changing this to unified - -Ddefault-hierarchy=hybrid - -Ddefault-kill-user-processes=false - -Dfallback-hostname='archlinux' - -Dntp-servers="${timeservers[*]}" - -Drpmmacrosdir=no - -Dsysvinit-path= - -Dsysvrcnd-path= - ) - - arch-meson "$pkgbase-stable" build "${meson_options[@]}" - - ninja -C build -} - -package_systemd() { - pkgdesc="system and service manager" - license=('GPL2' 'LGPL2.1') - groups=('base-devel') - depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' - 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' - 'util-linux' 'xz' 'pcre2') - provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") - replaces=('nss-myhostname' 'systemd-tools' 'udev') - conflicts=('nss-myhostname' 'systemd-tools' 'udev') - optdepends=('libmicrohttpd: remote journald capabilities' - 'quota-tools: kernel-level quota management' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'polkit: allow administration as unprivileged user') - backup=(etc/pam.d/systemd-user - etc/systemd/coredump.conf - etc/systemd/journald.conf - etc/systemd/journal-remote.conf - etc/systemd/journal-upload.conf - etc/systemd/logind.conf - etc/systemd/system.conf - etc/systemd/timesyncd.conf - etc/systemd/resolved.conf - etc/systemd/user.conf - etc/udev/udev.conf) - install="systemd.install" - - DESTDIR="$pkgdir" ninja -C build install - - # don't write units to /etc by default. some of these will be re-enabled on - # post_install. - rm -r "$pkgdir/etc/systemd/system/"*.wants - rm -r "$pkgdir/etc/systemd/system/"*.service - - # add back tmpfiles.d/legacy.conf - install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - sed -i 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules - sed -i 's/dialout/uucp/g; - s/tape/storage/g; - s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf - - # add mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd" - install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" - install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" - - # ensure proper permissions for /var/log/journal - # The permissions are stored with named group by tar, so this works with - # users and groups populated by systemd-sysusers. This is only to prevent a - # warning from pacman as permissions are set by systemd-tmpfiles anyway. - chown root:systemd-journal "$pkgdir/var/log/journal" - chmod 2755 "$pkgdir/var/log/journal" - - # match directory owner/group and mode from extra/polkit - chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d - chmod 0750 "$pkgdir"/usr/share/polkit-1/rules.d - - # we'll create this on installation - rmdir "$pkgdir/var/log/journal/remote" - - # ship default policy to leave services disabled - echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - - # manpages shipped with systemd-sysvcompat - rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 - - # executable (symlinks) shipped with systemd-sysvcompat - rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} - - # runtime libraries shipped with libsystemd - rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* - - # allow core/filesystem to pristine nsswitch.conf - rm "$pkgdir/usr/share/factory/etc/nsswitch.conf" - sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf" - - # add example bootctl configuration - install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf - install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf - install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp - - install -Dm644 "$srcdir/systemd-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook" - install -Dm644 "$srcdir/systemd-sysusers.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook" - install -Dm644 "$srcdir/systemd-tmpfiles.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook" - install -Dm644 "$srcdir/systemd-update.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-update.hook" - - # overwrite the systemd-user PAM configuration with our own - install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user" -} - -package_libsystemd() { - pkgdesc="systemd client libraries" - depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') - license=('GPL2') - provides=('libsystemd.so' 'libudev.so') - - # meson does not support installing subsets of files, no? - # So do a full install to temporary directory, then install what we need. - DESTDIR="$srcdir"/full-install ninja -C build install - - install -dm755 "$pkgdir"/usr/lib/ - cp --archive "$srcdir"/full-install/usr/lib/lib{nss_*,systemd,udev}.so* "$pkgdir"/usr/lib/ -} - -package_systemd-sysvcompat() { - pkgdesc="sysvinit compat for systemd" - license=('GPL2') - groups=('base') - conflicts=('sysvinit') - depends=('systemd') - - install -dm755 "$pkgdir"/usr/share/man/man8 - cp -d --no-preserve=ownership,timestamp \ - build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ - "$pkgdir"/usr/share/man/man8 - - install -dm755 "$pkgdir/usr/bin" - for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s 'systemctl' "$pkgdir/usr/bin/$tool" - done - - ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init" -} - -# vim: ft=sh syn=sh et Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 318017, systemd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,269 @@ +# $Id$ +# Maintainer: Christian Hesse <m...@eworm.de> +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Maintainer: Tom Gundersen <t...@jklm.no> + +pkgbase=systemd +pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') +# Can be from either systemd or systemd-stable +_commit='738ab7502afb7663d9aacdd73e79025aa7cd0a9b' +pkgver=238.0 +pkgrel=2 +arch=('x86_64') +url="https://www.github.com/systemd/systemd" +makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' + 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' + 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' + 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git' + 'meson' 'libseccomp' 'pcre2') +options=('strip') +validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lenn...@poettering.net> + '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbys...@in.waw.pl> +source=('git+https://github.com/systemd/systemd-stable' + 'git+https://github.com/systemd/systemd' + '0001-Use-Arch-Linux-device-access-groups.patch' + 'initcpio-hook-udev' + 'initcpio-install-systemd' + 'initcpio-install-udev' + 'arch.conf' + 'loader.conf' + 'splash-arch.bmp' + 'systemd-user.pam' + 'systemd-hook' + 'systemd-binfmt.hook' + 'systemd-catalog.hook' + 'systemd-daemon-reload.hook' + 'systemd-hwdb.hook' + 'systemd-sysctl.hook' + 'systemd-sysusers.hook' + 'systemd-tmpfiles.hook' + 'systemd-udev-reload.hook' + 'systemd-update.hook') +sha512sums=('SKIP' + 'SKIP' + '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' + 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' + '86d7cacd7536b1069c82bbbb08de7ec81e7f0f18a19fc2b06fabe90db4700623eb3540b75121080d325672d92e26912632ae4f93fd3c0bb48eb3e5eedd88352c' + 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' + '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' + 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' + '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' + 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' + '370d8c0fafc229607e968b884bbbcef426bef51fd0599bfca60717ffb6090e6206e90ca05f2cba835248ddb1f66c938f85515efc518cd24fb8d3ccc8bca4e065' + '46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177' + '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb' + '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2' + '471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d' + '3b11e8956169e6d80eca6e6de1b3e42641454d9d7be48961d400754f2242077d69fb7bfbeb0904f35ce569511036a7c9614a4a1cc3096fba993f46ae65e02895' + 'bf3225011760695040e9f7be2560348e68e86eac0295f5a17a6f7e3dda7ad7c008812a15904e2071b53d5f8048891602c8a9a18608ac64930f2d8cc4fac2a319' + 'ff1429a7c88e21d578c25d07e8cd9568577feb5a940fe39a7a815cf8431c57ca951ac6b394c53d2cdeb4efc645572c0b1b670a48cafcc405db41a6602b548e35' + 'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2' + '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67') + +_backports=( +) + +_reverts=( + '56c8d7444ac212c48443a0d30e42ea279140f96d' # https://bugs.archlinux.org/task/57741 +) + +_validate_tag() ( + local success fingerprint trusted status tag=v${pkgver%.*} + + cd "$srcdir/$pkgbase-stable" + parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1) + + if (( ! success )); then + error 'failed to validate tag %s\n' "$tag" + return 1 + fi + + if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then + error 'unknown or untrusted public key: %s\n' "$fingerprint" + return 1 + fi + + case $status in + 'expired') + warning 'the signature has expired' + ;; + 'expiredkey') + warning 'the key has expired' + ;; + esac + + return 0 +) + +prepare() { + cd "$pkgbase-stable" + + git remote add -f upstream ../systemd + git checkout "$_commit" + + local c + for c in "${_backports[@]}"; do + git cherry-pick -n "$c" + done + for c in "${_reverts[@]}"; do + git revert -n "$c" + done + + # Replace cdrom/dialout/tape groups with optical/uucp/storage + patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch +} + +pkgver() { + local version count + + cd "$pkgbase-stable" + + version="$(git describe --abbrev=0 --tags)" + count="$(git rev-list --count ${version}..)" + printf '%s.%s' "${version#v}" "${count}" +} + +build() { + _validate_tag || return + + local timeservers=({0..3}.arch.pool.ntp.org) + + local meson_options=( + -Daudit=false + -Dgnuefi=true + -Dima=false + -Dlz4=true + + -Ddbuspolicydir=/usr/share/dbus-1/system.d + -Ddefault-dnssec=no + # TODO(dreisner): consider changing this to unified + -Ddefault-hierarchy=hybrid + -Ddefault-kill-user-processes=false + -Dfallback-hostname='archlinux' + -Dntp-servers="${timeservers[*]}" + -Drpmmacrosdir=no + -Dsysvinit-path= + -Dsysvrcnd-path= + ) + + arch-meson "$pkgbase-stable" build "${meson_options[@]}" + + ninja -C build +} + +check() { + cd build + meson test +} + +package_systemd() { + pkgdesc="system and service manager" + license=('GPL2' 'LGPL2.1') + groups=('base-devel') + depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' + 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' + 'util-linux' 'xz' 'pcre2') + provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('nss-myhostname' 'systemd-tools' 'udev') + conflicts=('nss-myhostname' 'systemd-tools' 'udev') + optdepends=('libmicrohttpd: remote journald capabilities' + 'quota-tools: kernel-level quota management' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'polkit: allow administration as unprivileged user') + backup=(etc/pam.d/systemd-user + etc/systemd/coredump.conf + etc/systemd/journald.conf + etc/systemd/journal-remote.conf + etc/systemd/journal-upload.conf + etc/systemd/logind.conf + etc/systemd/system.conf + etc/systemd/timesyncd.conf + etc/systemd/resolved.conf + etc/systemd/user.conf + etc/udev/udev.conf) + install=systemd.install + + DESTDIR="$pkgdir" ninja -C build install + + # don't write units to /etc by default. some of these will be re-enabled on + # post_install. + rm -rv "$pkgdir"/etc/systemd/system/* + + # we'll create this on installation + rmdir "$pkgdir"/var/log/journal/remote + + # runtime libraries shipped with libsystemd + install -dm755 libsystemd + mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* libsystemd + + # manpages shipped with systemd-sysvcompat + rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 + + # executable (symlinks) shipped with systemd-sysvcompat + rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} + + # avoid a potential conflict with [core]/filesystem + rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf + sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf + + # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat + install -m644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d + + # ship default policy to leave services disabled + echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset + + # add mkinitcpio hooks + install -Dm644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd + install -Dm644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev + install -Dm644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev + + # ensure proper permissions for /var/log/journal + # The permissions are stored with named group by tar, so this works with + # users and groups populated by systemd-sysusers. This is only to prevent a + # warning from pacman as permissions are set by systemd-tmpfiles anyway. + install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal + + # match directory owner/group and mode from [extra]/polkit + install -d -o root -g 102 -m 750 "$pkgdir"/usr/share/polkit-1/rules.d + + # add example bootctl configuration + install -Dm644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf + install -Dm644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -Dm644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp + + # pacman hooks + install -Dm755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook + install -Dm644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook + + # overwrite the systemd-user PAM configuration with our own + install -Dm644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') + license=('GPL2') + provides=('libsystemd.so' 'libudev.so') + + install -dm755 "$pkgdir"/usr + mv libsystemd "$pkgdir"/usr/lib +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + license=('GPL2') + groups=('base') + conflicts=('sysvinit') + depends=('systemd') + + install -Dm644 -t "$pkgdir"/usr/share/man/man8 \ + build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 + + install -dm755 "$pkgdir"/usr/bin + ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s systemctl "$pkgdir"/usr/bin/$tool + done +} + +# vim: ft=sh syn=sh et Deleted: arch.conf =================================================================== --- arch.conf 2018-03-07 23:46:30 UTC (rev 318017) +++ arch.conf 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,7 +0,0 @@ -## This is just an example config file. -## Please edit the paths and kernel parameters according to your system. - -title Arch Linux -linux /vmlinuz-linux -initrd /initramfs-linux.img -options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap Copied: systemd/repos/testing-x86_64/arch.conf (from rev 318017, systemd/trunk/arch.conf) =================================================================== --- arch.conf (rev 0) +++ arch.conf 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,7 @@ +## This is just an example config file. +## Please edit the paths and kernel parameters according to your system. + +title Arch Linux +linux /vmlinuz-linux +initrd /initramfs-linux.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap Deleted: initcpio-hook-udev =================================================================== --- initcpio-hook-udev 2018-03-07 23:46:30 UTC (rev 318017) +++ initcpio-hook-udev 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,22 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create --boot - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never - udevd_running=1 -} - -run_hook() { - msg ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -} - -run_cleanuphook() { - udevadm control --exit - udevadm info --cleanup-db -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 318017, systemd/trunk/initcpio-hook-udev) =================================================================== --- initcpio-hook-udev (rev 0) +++ initcpio-hook-udev 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,22 @@ +#!/usr/bin/ash + +run_earlyhook() { + kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf + systemd-tmpfiles --prefix=/dev --create --boot + /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +} + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: initcpio-install-systemd =================================================================== --- initcpio-install-systemd 2018-03-07 23:46:30 UTC (rev 318017) +++ initcpio-install-systemd 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,198 +0,0 @@ -#!/bin/bash - -strip_quotes() { - local len=${#1} quotes=$'[\'"]' str=${!1} - - if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then - printf -v "$1" %s "${str:1:-1}" - fi -} - -add_udev_rule() { - # Add an udev rules file to the initcpio image. Dependencies on binaries - # will be discovered and added. - # $1: path to rules file (or name of rules file) - - local rules= rule= key= value= binary= - - rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") - if [[ -z $rules ]]; then - # complain about not found rules - return 1 - fi - - add_file "$rules" - - while IFS=, read -ra rule; do - # skip empty lines, comments - [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue - - for pair in "${rule[@]}"; do - IFS=' =' read -r key value <<< "$pair" - case $key in - RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) - strip_quotes 'value' - # just take the first word as the binary name - binary=${value%% *} - [[ ${binary:0:1} == '$' ]] && continue - if [[ ${binary:0:1} != '/' ]]; then - binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") - fi - add_binary "$binary" - ;; - esac - done - done <"$rules" -} - -add_systemd_unit() { - # Add a systemd unit file to the initcpio image. Hard dependencies on binaries - # and other unit files will be discovered and added. - # $1: path to rules file (or name of rules file) - - local unit= rule= entry= key= value= binary= dep= - - unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1") - if [[ -z $unit ]]; then - # complain about not found unit file - return 1 - fi - - add_file "$unit" - - while IFS='=' read -r key values; do - read -ra values <<< "$values" - - case $key in - Requires|OnFailure) - # only add hard dependencies (not Wants) - map add_systemd_unit "${values[@]}" - ;; - Exec*) - # don't add binaries unless they are required - if [[ ${values[0]:0:1} != '-' ]]; then - add_binary "${values[0]}" - fi - ;; - esac - - done <"$unit" - - # preserve reverse soft dependency - for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do - if [[ -L $dep ]]; then - add_symlink "$dep" - fi - done - - # add hard dependencies - if [[ -d $unit.requires ]]; then - for dep in "$unit".requires/*; do - add_systemd_unit ${dep##*/} - done - fi -} - -add_systemd_drop_in() { - local unit=$1 dropin_name=$2 - - mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d" - cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf" -} - -build() { - local rules unit - - # from base - add_binary /bin/mount - add_binary /usr/bin/kmod /usr/bin/modprobe - add_binary /usr/lib/systemd/systemd /init - add_binary /usr/bin/sulogin - - map add_binary \ - /usr/bin/systemd-tmpfiles \ - /usr/lib/systemd/systemd-hibernate-resume \ - /usr/lib/systemd/systemd-sulogin-shell \ - /usr/lib/systemd/system-generators/systemd-fstab-generator \ - /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ - /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator - - # udev rules and systemd units - map add_udev_rule "$rules" \ - 50-udev-default.rules \ - 60-persistent-storage.rules \ - 64-btrfs.rules \ - 80-drivers.rules \ - 99-systemd.rules - - map add_systemd_unit \ - initrd-cleanup.service \ - initrd-fs.target \ - initrd-parse-etc.service \ - initrd-root-fs.target \ - initrd-root-device.target \ - initrd-switch-root.service \ - initrd-switch-root.target \ - initrd-udevadm-cleanup-db.service \ - initrd.target \ - kmod-static-nodes.service \ - local-fs.target \ - local-fs-pre.target \ - paths.target \ - reboot.target \ - slices.target \ - sockets.target \ - swap.target \ - systemd-fsck@.service \ - systemd-hibernate-resume@.service \ - systemd-journald.service \ - systemd-journald-audit.socket \ - systemd-journald-dev-log.socket \ - systemd-modules-load.service \ - systemd-tmpfiles-setup-dev.service \ - systemd-udev-trigger.service \ - systemd-udevd-control.socket \ - systemd-udevd-kernel.socket \ - systemd-udevd.service \ - timers.target \ - rescue.target \ - emergency.target - - add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" - add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" - - add_binary "$(readlink -f /usr/lib/libnss_files.so)" - printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ - 'passwd: files' \ - 'group: files' \ - 'shadow: files' - - echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd" - echo "root:x:0:root" >"$BUILDROOT/etc/group" - echo "root::::::::" >"$BUILDROOT/etc/shadow" - - add_systemd_drop_in systemd-udevd.service resolve-names <<EOF -[Service] -ExecStart= -ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never -EOF - - add_dir "/etc/modules-load.d" - ( - . "$_f_config" - set -f - printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf" - ) -} - -help() { - cat <<HELPEOF -This will install a basic systemd setup in your initramfs, and is meant to -replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime -components will need to be ported, and will not work as intended. You also may -wish to still include the 'base' hook (before this hook) to ensure that a -rescue shell exists on your initramfs. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: systemd/repos/testing-x86_64/initcpio-install-systemd (from rev 318017, systemd/trunk/initcpio-install-systemd) =================================================================== --- initcpio-install-systemd (rev 0) +++ initcpio-install-systemd 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,198 @@ +#!/bin/bash + +strip_quotes() { + local len=${#1} quotes=$'[\'"]' str=${!1} + + if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then + printf -v "$1" %s "${str:1:-1}" + fi +} + +add_udev_rule() { + # Add an udev rules file to the initcpio image. Dependencies on binaries + # will be discovered and added. + # $1: path to rules file (or name of rules file) + + local rules= rule= key= value= binary= + + rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") + if [[ -z $rules ]]; then + # complain about not found rules + return 1 + fi + + add_file "$rules" + + while IFS=, read -ra rule; do + # skip empty lines, comments + [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue + + for pair in "${rule[@]}"; do + IFS=' =' read -r key value <<< "$pair" + case $key in + RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) + strip_quotes 'value' + # just take the first word as the binary name + binary=${value%% *} + [[ ${binary:0:1} == '$' ]] && continue + if [[ ${binary:0:1} != '/' ]]; then + binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") + fi + add_binary "$binary" + ;; + esac + done + done <"$rules" +} + +add_systemd_unit() { + # Add a systemd unit file to the initcpio image. Hard dependencies on binaries + # and other unit files will be discovered and added. + # $1: path to rules file (or name of rules file) + + local unit= rule= entry= key= value= binary= dep= + + unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1") + if [[ -z $unit ]]; then + # complain about not found unit file + return 1 + fi + + add_file "$unit" + + while IFS='=' read -r key values; do + read -ra values <<< "$values" + + case $key in + Requires|OnFailure) + # only add hard dependencies (not Wants) + map add_systemd_unit "${values[@]}" + ;; + Exec*) + # don't add binaries unless they are required + if [[ ${values[0]:0:1} != '-' ]]; then + add_binary "${values[0]}" + fi + ;; + esac + + done <"$unit" + + # preserve reverse soft dependency + for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do + if [[ -L $dep ]]; then + add_symlink "$dep" + fi + done + + # add hard dependencies + if [[ -d $unit.requires ]]; then + for dep in "$unit".requires/*; do + add_systemd_unit ${dep##*/} + done + fi +} + +add_systemd_drop_in() { + local unit=$1 dropin_name=$2 + + mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d" + cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf" +} + +build() { + local rules unit + + # from base + add_binary /bin/mount + add_binary /usr/bin/kmod /usr/bin/modprobe + add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/sulogin + + map add_binary \ + /usr/bin/systemd-tmpfiles \ + /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/systemd-sulogin-shell \ + /usr/lib/systemd/system-generators/systemd-fstab-generator \ + /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ + /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + + # udev rules and systemd units + map add_udev_rule "$rules" \ + 50-udev-default.rules \ + 60-persistent-storage.rules \ + 64-btrfs.rules \ + 80-drivers.rules \ + 99-systemd.rules + + map add_systemd_unit \ + initrd-cleanup.service \ + initrd-fs.target \ + initrd-parse-etc.service \ + initrd-root-fs.target \ + initrd-root-device.target \ + initrd-switch-root.service \ + initrd-switch-root.target \ + initrd-udevadm-cleanup-db.service \ + initrd.target \ + kmod-static-nodes.service \ + local-fs.target \ + local-fs-pre.target \ + paths.target \ + reboot.target \ + slices.target \ + sockets.target \ + swap.target \ + systemd-fsck@.service \ + systemd-hibernate-resume@.service \ + systemd-journald.service \ + systemd-journald-audit.socket \ + systemd-journald-dev-log.socket \ + systemd-modules-load.service \ + systemd-tmpfiles-setup-dev.service \ + systemd-udev-trigger.service \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket \ + systemd-udevd.service \ + timers.target \ + rescue.target \ + emergency.target + + add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" + add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" + + add_binary "$(readlink -f /usr/lib/libnss_files.so)" + printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ + 'passwd: files' \ + 'group: files' \ + 'shadow: files' + + echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd" + echo "root:x:0:root" >"$BUILDROOT/etc/group" + echo "root::::::::" >"$BUILDROOT/etc/shadow" + + add_systemd_drop_in systemd-udevd.service resolve-names <<EOF +[Service] +ExecStart= +ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never +EOF + + add_dir "/etc/modules-load.d" + ( + . "$_f_config" + set -f + printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf" + ) +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup in your initramfs, and is meant to +replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime +components will need to be ported, and will not work as intended. You also may +wish to still include the 'base' hook (before this hook) to ensure that a +rescue shell exists on your initramfs. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: initcpio-install-udev =================================================================== --- initcpio-install-udev 2018-03-07 23:46:30 UTC (rev 318017) +++ initcpio-install-udev 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,29 +0,0 @@ -#!/bin/bash - -build() { - local rules tool - - add_binary /usr/lib/systemd/systemd-udevd - add_binary /usr/bin/udevadm - add_binary /usr/bin/systemd-tmpfiles - - for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do - add_file "/usr/lib/udev/rules.d/$rules" - done - for tool in ata_id scsi_id; do - add_file "/usr/lib/udev/$tool" - done - - add_runscript -} - -help() { - cat <<HELPEOF -This hook adds the udev daemon to the initramfs, allowing for dynamic loading -of modules and reliable detection of the root device via tags (e.g. UUID or -LABEL). Do not remove this hook unless you are using the systemd hook, or you -know what you're doing. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: systemd/repos/testing-x86_64/initcpio-install-udev (from rev 318017, systemd/trunk/initcpio-install-udev) =================================================================== --- initcpio-install-udev (rev 0) +++ initcpio-install-udev 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,29 @@ +#!/bin/bash + +build() { + local rules tool + + add_binary /usr/lib/systemd/systemd-udevd + add_binary /usr/bin/udevadm + add_binary /usr/bin/systemd-tmpfiles + + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + + add_runscript +} + +help() { + cat <<HELPEOF +This hook adds the udev daemon to the initramfs, allowing for dynamic loading +of modules and reliable detection of the root device via tags (e.g. UUID or +LABEL). Do not remove this hook unless you are using the systemd hook, or you +know what you're doing. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: loader.conf =================================================================== --- loader.conf 2018-03-07 23:46:30 UTC (rev 318017) +++ loader.conf 2018-03-07 23:49:00 UTC (rev 318018) @@ -1 +0,0 @@ -default arch Copied: systemd/repos/testing-x86_64/loader.conf (from rev 318017, systemd/trunk/loader.conf) =================================================================== --- loader.conf (rev 0) +++ loader.conf 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1 @@ +default arch Deleted: splash-arch.bmp =================================================================== (Binary files differ) Copied: systemd/repos/testing-x86_64/splash-arch.bmp (from rev 318017, systemd/trunk/splash-arch.bmp) =================================================================== (Binary files differ) Copied: systemd/repos/testing-x86_64/systemd-binfmt.hook (from rev 318017, systemd/trunk/systemd-binfmt.hook) =================================================================== --- systemd-binfmt.hook (rev 0) +++ systemd-binfmt.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/lib/binfmt.d/*.conf + +[Action] +Description = Registering binary formats... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook binfmt +NeedsTargets Copied: systemd/repos/testing-x86_64/systemd-catalog.hook (from rev 318017, systemd/trunk/systemd-catalog.hook) =================================================================== --- systemd-catalog.hook (rev 0) +++ systemd-catalog.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/catalog/* + +[Action] +Description = Updating journal message catalog... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook catalog Copied: systemd/repos/testing-x86_64/systemd-daemon-reload.hook (from rev 318017, systemd/trunk/systemd-daemon-reload.hook) =================================================================== --- systemd-daemon-reload.hook (rev 0) +++ systemd-daemon-reload.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/system/* + +[Action] +Description = Reloading system manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload Copied: systemd/repos/testing-x86_64/systemd-hook (from rev 318017, systemd/trunk/systemd-hook) =================================================================== --- systemd-hook (rev 0) +++ systemd-hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,31 @@ +#!/bin/sh -e + +only_live() { + if [ ! -d /run/systemd/system ]; then + echo >&2 " Skipped: Current root is not booted." + exit 0 + fi +} + +each_conf() { + while read -r f; do + "$@" "$(basename "$f")" + done +} + +case $1 in + catalog) /usr/bin/journalctl --update-catalog ;; + hwdb) /usr/bin/systemd-hwdb --usr update ;; + update) touch -c /usr ;; + sysusers) each_conf /usr/bin/systemd-sysusers ;; + tmpfiles) each_conf /usr/bin/systemd-tmpfiles --create ;; + + daemon-reload) only_live; /usr/bin/systemctl daemon-reload ;; + udev-reload) only_live; /usr/bin/udevadm control --reload ;; + binfmt) only_live; each_conf /usr/lib/systemd/systemd-binfmt ;; + sysctl) only_live; each_conf /usr/lib/systemd/systemd-sysctl ;; + + *) echo >&2 " Invalid operation '$1'"; exit 1 ;; +esac + +exit 0 Deleted: systemd-hwdb.hook =================================================================== --- systemd-hwdb.hook 2018-03-07 23:46:30 UTC (rev 318017) +++ systemd-hwdb.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/udev/hwdb.d/* - -[Action] -Description = Updating udev hardware database... -When = PostTransaction -Exec = /usr/bin/systemd-hwdb --usr update Copied: systemd/repos/testing-x86_64/systemd-hwdb.hook (from rev 318017, systemd/trunk/systemd-hwdb.hook) =================================================================== --- systemd-hwdb.hook (rev 0) +++ systemd-hwdb.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/udev/hwdb.d/* + +[Action] +Description = Updating udev hardware database... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook hwdb Copied: systemd/repos/testing-x86_64/systemd-sysctl.hook (from rev 318017, systemd/trunk/systemd-sysctl.hook) =================================================================== --- systemd-sysctl.hook (rev 0) +++ systemd-sysctl.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/lib/sysctl.d/*.conf + +[Action] +Description = Applying kernel sysctl settings... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook sysctl +NeedsTargets Deleted: systemd-sysusers.hook =================================================================== --- systemd-sysusers.hook 2018-03-07 23:46:30 UTC (rev 318017) +++ systemd-sysusers.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = usr/lib/sysusers.d/*.conf - -[Action] -Description = Updating system user accounts... -When = PostTransaction -Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "$(basename "$f")" ; done' -NeedsTargets Copied: systemd/repos/testing-x86_64/systemd-sysusers.hook (from rev 318017, systemd/trunk/systemd-sysusers.hook) =================================================================== --- systemd-sysusers.hook (rev 0) +++ systemd-sysusers.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/lib/sysusers.d/*.conf + +[Action] +Description = Creating system user accounts... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook sysusers +NeedsTargets Deleted: systemd-tmpfiles.hook =================================================================== --- systemd-tmpfiles.hook 2018-03-07 23:46:30 UTC (rev 318017) +++ systemd-tmpfiles.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = usr/lib/tmpfiles.d/*.conf - -[Action] -Description = Creating temporary files... -When = PostTransaction -Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create "$(basename "$f")"; done' -NeedsTargets Copied: systemd/repos/testing-x86_64/systemd-tmpfiles.hook (from rev 318017, systemd/trunk/systemd-tmpfiles.hook) =================================================================== --- systemd-tmpfiles.hook (rev 0) +++ systemd-tmpfiles.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/lib/tmpfiles.d/*.conf + +[Action] +Description = Creating temporary files... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles +NeedsTargets Copied: systemd/repos/testing-x86_64/systemd-udev-reload.hook (from rev 318017, systemd/trunk/systemd-udev-reload.hook) =================================================================== --- systemd-udev-reload.hook (rev 0) +++ systemd-udev-reload.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/udev/rules.d/* + +[Action] +Description = Reloading device manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook udev-reload Deleted: systemd-update.hook =================================================================== --- systemd-update.hook 2018-03-07 23:46:30 UTC (rev 318017) +++ systemd-update.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/ - -[Action] -Description = Arming ConditionNeedsUpdate... -When = PostTransaction -Exec = /usr/bin/touch -c /usr Copied: systemd/repos/testing-x86_64/systemd-update.hook (from rev 318017, systemd/trunk/systemd-update.hook) =================================================================== --- systemd-update.hook (rev 0) +++ systemd-update.hook 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/ + +[Action] +Description = Arming ConditionNeedsUpdate... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook update Deleted: systemd-user.pam =================================================================== --- systemd-user.pam 2018-03-07 23:46:30 UTC (rev 318017) +++ systemd-user.pam 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,5 +0,0 @@ -# Used by systemd --user instances. - -account include system-login -session required pam_loginuid.so -session include system-login Copied: systemd/repos/testing-x86_64/systemd-user.pam (from rev 318017, systemd/trunk/systemd-user.pam) =================================================================== --- systemd-user.pam (rev 0) +++ systemd-user.pam 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,5 @@ +# Used by systemd --user instances. + +account include system-login +session required pam_loginuid.so +session include system-login Deleted: systemd.install =================================================================== --- systemd.install 2018-03-07 23:46:30 UTC (rev 318017) +++ systemd.install 2018-03-07 23:49:00 UTC (rev 318018) @@ -1,99 +0,0 @@ -#!/bin/bash - -sd_booted() { - [[ -d run/systemd/system && ! -L run/systemd/system ]] -} - -add_journal_acls() { - # ignore errors, since the filesystem might not support ACLs - setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null - : -} - -post_common() { - systemd-sysusers - journalctl --update-catalog -} - -_216_2_changes() { - echo ':: Coredumps are handled by systemd by default. Collection behavior can be' - echo ' tuned in /etc/systemd/coredump.conf.' -} - -_219_2_changes() { - if mkdir -m2755 var/log/journal/remote 2>/dev/null; then - chgrp systemd-journal-remote var/log/journal/remote - fi -} - -_219_4_changes() { - if ! systemctl is-enabled -q remote-fs.target; then - systemctl enable -q remote-fs.target - fi -} - -_230_1_changes() { - echo ':: systemd-bootchart is no longer included with systemd' -} - -_232_8_changes() { - # paper over possible effects of CVE-2016-10156 - local stamps=(/var/lib/systemd/timers/*.timer) - - if [[ -f ${stamps[0]} ]]; then - chmod 0644 "${stamps[@]}" - fi -} - -_233_75_3_changes() { - # upstream installs services to /etc, which we remove - # to keep bus activation we re-enable systemd-resolved - if systemctl is-enabled -q systemd-resolved.service; then - systemctl reenable systemd-resolved.service 2>/dev/null - fi -} - -post_install() { - systemd-machine-id-setup - - post_common "$@" - - add_journal_acls - - # enable some services by default, but don't track them - systemctl enable getty@tty1.service remote-fs.target - - echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" - - # group 'systemd-journal-remote' is created by systemd-sysusers - mkdir -m2755 var/log/journal/remote - chgrp systemd-journal-remote var/log/journal/remote -} - -post_upgrade() { - post_common "$@" - - # don't reexec if the old version is 231-1 or 231-2. - # https://github.com/systemd/systemd/commit/bd64d82c1c - if [[ $1 != 231-[12] ]] && sd_booted; then - systemctl --system daemon-reexec - fi - - local v upgrades=( - 216-2 - 219-2 - 219-4 - 230-1 - 232-8 - 233.75-3 - ) - - for v in "${upgrades[@]}"; do - if [[ $(vercmp "$v" "$2") -eq 1 ]]; then - "_${v//[.-]/_}_changes" - fi - done -} - -# vim:set ts=2 sw=2 et: Copied: systemd/repos/testing-x86_64/systemd.install (from rev 318017, systemd/trunk/systemd.install) =================================================================== --- systemd.install (rev 0) +++ systemd.install 2018-03-07 23:49:00 UTC (rev 318018) @@ -0,0 +1,99 @@ +#!/bin/bash + +sd_booted() { + [[ -d run/systemd/system && ! -L run/systemd/system ]] +} + +add_journal_acls() { + # ignore errors, since the filesystem might not support ACLs + setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null + : +} + +post_common() { + systemd-sysusers + journalctl --update-catalog +} + +_216_2_changes() { + echo ':: Coredumps are handled by systemd by default. Collection behavior can be' + echo ' tuned in /etc/systemd/coredump.conf.' +} + +_219_2_changes() { + if mkdir -m2755 var/log/journal/remote 2>/dev/null; then + chgrp systemd-journal-remote var/log/journal/remote + fi +} + +_219_4_changes() { + if ! systemctl is-enabled -q remote-fs.target; then + systemctl enable -q remote-fs.target + fi +} + +_230_1_changes() { + echo ':: systemd-bootchart is no longer included with systemd' +} + +_232_8_changes() { + # paper over possible effects of CVE-2016-10156 + local stamps=(/var/lib/systemd/timers/*.timer) + + if [[ -f ${stamps[0]} ]]; then + chmod 0644 "${stamps[@]}" + fi +} + +_233_75_3_changes() { + # upstream installs services to /etc, which we remove + # to keep bus activation we re-enable systemd-resolved + if systemctl is-enabled -q systemd-resolved.service; then + systemctl reenable systemd-resolved.service 2>/dev/null + fi +} + +post_install() { + systemd-machine-id-setup + + post_common "$@" + + add_journal_acls + + # enable some services by default, but don't track them + systemctl enable getty@tty1.service remote-fs.target + + echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" + + # group 'systemd-journal-remote' is created by systemd-sysusers + mkdir -m2755 var/log/journal/remote + chgrp systemd-journal-remote var/log/journal/remote +} + +post_upgrade() { + post_common "$@" + + # don't reexec if the old version is 231-1 or 231-2. + # https://github.com/systemd/systemd/commit/bd64d82c1c + if [[ $1 != 231-[12] ]] && sd_booted; then + systemctl --system daemon-reexec + fi + + local v upgrades=( + 216-2 + 219-2 + 219-4 + 230-1 + 232-8 + 233.75-3 + ) + + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//[.-]/_}_changes" + fi + done +} + +# vim:set ts=2 sw=2 et: