diff --git a/lfs/systemd-257.8.PKGBUILD b/lfs/systemd-257.8.PKGBUILD index 232d22f..08c7be4 100644 --- a/lfs/systemd-257.8.PKGBUILD +++ b/lfs/systemd-257.8.PKGBUILD @@ -6,19 +6,21 @@ license=("LGPL-2.1-or-laterC" "C0-1.0" "GPL-2.0-or-later" "MIT-0") sources=("${pkgname}-${pkgver}.tar.gz" "${pkgname}-man-pages-${pkgver}.tar.xz" "30-systemd-daemon-reload-system.HOOK" + "30-systemd-daemon-reload-user.HOOK" ) urls=("https://github.com/systemd/systemd/archive/v${pkgver}/${sources[0]}" "https://anduin.linuxfromscratch.org/LFS/${sources[1]}" "30-systemd-daemon-reload-system.HOOK" + "30-systemd-daemon-reload-user.HOOK" ) md5sums=("25fe5d328e22641254761f1baa74cee0" "a44063e2ec0cf4adfd2ed5c9e9e095c5" - "4074a547dcc72dcde3196face4df5a97" + "49ffd7e5c810f8b3cf14fb9535d6a4c5" + "e38543ca711f6ff063174b82afe3cbb3" ) src_prepare() { tar -xf ${distdir}/${sources[0]} --strip-components=1 - cp ${distdir}/${sources[2]} ./ sed -e 's/GROUP="render"/GROUP="video"/' \ -e 's/GROUP="sgx", //' \ -i rules.d/50-udev-default.rules.in @@ -56,18 +58,19 @@ src_build() { } src_check() { - pushd build + pushd build && if [[ ! -f /etc/os-release ]]; then echo 'NAME="Linux From Scratch"' > /etc/os-release fi - ninja test + ninja test && popd } src_install() { pushd build DESTDIR=$pkgdir ninja install - leaf_install_hook ../${sources[2]} + leaf_install_hook ${filedir}/${sources[2]} + leaf_install_hook ${filedir}/${sources[3]} install -d -v -m755 ${pkgdir}/usr/share/man tar -xf ${distdir}/${sources[1]} \ --no-same-owner --strip-components=1 \ diff --git a/lfs/systemd-257.8/30-systemd-daemon-reload-system.HOOK b/lfs/systemd-257.8/30-systemd-daemon-reload-system.HOOK index 8eef8e7..b3b471c 100644 --- a/lfs/systemd-257.8/30-systemd-daemon-reload-system.HOOK +++ b/lfs/systemd-257.8/30-systemd-daemon-reload-system.HOOK @@ -1,4 +1,4 @@ -target=(/usr/lib/sysusers.d/*.conf) +target=(/usr/lib/systemd/system/*) triggers=("install" "remove") operation(){ if systemd-detect-virt --chroot; then diff --git a/lfs/systemd-257.8/30-systemd-daemon-reload-user.HOOK b/lfs/systemd-257.8/30-systemd-daemon-reload-user.HOOK new file mode 100644 index 0000000..ad199ae --- /dev/null +++ b/lfs/systemd-257.8/30-systemd-daemon-reload-user.HOOK @@ -0,0 +1,14 @@ +target=(/usr/lib/systemd/user/*) +triggers=("install" "remove") +operation(){ + if systemd-detect-virt --chroot; then + echo >&2 " Skipped: Running in chroot." + exit 0 + fi + if ! systemd-notify --booted; then + echo >&2 " Skipped: Current root is not booted." + exit 0 + fi + + /usr/bin/systemctl reload 'user@*.service' +}