Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
systemd
Commits:
dca00fda by Christian Hesse at 2025-09-19T16:52:17+02:00
revert to old state, which should be fine with fix in place, ...
... and additional cleanups.
* do not discard output from `systemd-detect-virt --chroot`
* use `systemd-notify --booted`
* do not discard output from `systemd-notify --booted` - should be fine,
as it is quiet by default
* drop duplicate check for chroot from `udevd_live()`, is checked from
inside `systemd_live()` already
Thanks to @yhndnzj !
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- systemd-hook
Changes:
=====================================
.SRCINFO
=====================================
@@ -83,7 +83,7 @@ pkgbase = systemd
sha512sums =
3194d1f8bff31b88a79657df83632b9224b66ca2cf8fd806a3ef35cf7a43f46c09c57f3dfd02256a99b6514a8f789b7d3bcfd7e17e00e34aa55ff0c6cedb5f01
sha512sums =
5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75
sha512sums =
32580b82e97573d3e499821e2ce415ff134c0ec52c9b44a3c0862c4007d347f55636d6afac3dfc6831a9b384c7448075bdf3a12f369b4d8b62b24dfdb9c8a76a
- sha512sums =
a748031d0a7f07c0bdcdb9b0625c64c3426656dd2c6e2d8b9edcd7b2620c163148058ce8574722724d4b6c7785f4d87fe52fc443c6479c5118b647b73636d7b3
+ sha512sums =
05a3b19a2132c8c3048a66f2d06a9f8790e9c84c9ebdacc358456e38c5ebc8c02c542838f6aca3301f19ae83bc9fda66e701c682624dd5cf9fb119e452338a56
sha512sums =
299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5
sha512sums =
0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7
sha512sums =
2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc
=====================================
PKGBUILD
=====================================
@@ -65,7 +65,7 @@
sha512sums=('4703b54464ae42acb9e8b2a123f9e76cbe94b03c416292a95b9a8eb282eb2908e04
'3194d1f8bff31b88a79657df83632b9224b66ca2cf8fd806a3ef35cf7a43f46c09c57f3dfd02256a99b6514a8f789b7d3bcfd7e17e00e34aa55ff0c6cedb5f01'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
'32580b82e97573d3e499821e2ce415ff134c0ec52c9b44a3c0862c4007d347f55636d6afac3dfc6831a9b384c7448075bdf3a12f369b4d8b62b24dfdb9c8a76a'
-
'a748031d0a7f07c0bdcdb9b0625c64c3426656dd2c6e2d8b9edcd7b2620c163148058ce8574722724d4b6c7785f4d87fe52fc443c6479c5118b647b73636d7b3'
+
'05a3b19a2132c8c3048a66f2d06a9f8790e9c84c9ebdacc358456e38c5ebc8c02c542838f6aca3301f19ae83bc9fda66e701c682624dd5cf9fb119e452338a56'
'299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
'0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
'2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
=====================================
systemd-hook
=====================================
@@ -1,7 +1,7 @@
#!/bin/sh -e
skip_chrooted() {
- if systemd-detect-virt --chroot >/dev/null 2>&1; then
+ if systemd-detect-virt --chroot; then
echo >&2 " Skipped: Running in chroot."
exit 0
fi
@@ -10,14 +10,13 @@ skip_chrooted() {
systemd_live() {
skip_chrooted
- if ! systemctl is-active --quiet init.scope >/dev/null 2>&1; then
+ if ! systemd-notify --booted; then
echo >&2 " Skipped: Current root is not booted."
exit 0
fi
}
udevd_live() {
- skip_chrooted
systemd_live
if [ ! -S /run/udev/control ]; then
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/commit/dca00fdadcf82af1a4e03ae51439b3bafa74060b
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/commit/dca00fdadcf82af1a4e03ae51439b3bafa74060b
You're receiving this email because of your account on gitlab.archlinux.org.
