diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | systemd-hook | 9 |
3 files changed, 23 insertions, 14 deletions
@@ -1,5 +1,5 @@ pkgbase = systemd-selinux - pkgver = 248.2 + pkgver = 248.3 pkgrel = 2 url = https://www.github.com/systemd/systemd arch = x86_64 @@ -42,7 +42,7 @@ pkgbase = systemd-selinux makedepends = rsync makedepends = libselinux options = strip - source = git+https://github.com/systemd/systemd-stable#tag=bc3ad898fc7b74e818c80fdb7b14a3b9c6d91475?signed + source = git+https://github.com/systemd/systemd-stable#tag=fd9ad7d3bc35a3633b99edac14ff2a4fb10599b7?signed source = git+https://github.com/systemd/systemd#tag=v248?signed source = 0001-Use-Arch-Linux-device-access-groups.patch source = 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch @@ -76,7 +76,7 @@ pkgbase = systemd-selinux sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75 sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19 - sha512sums = 869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323 + sha512sums = 217a9dc3f9d8cd0c9fee54f777396f5a270c2e8a30c572ce5f635165adadcec275af0dae1456019cedb9cc93b7cef0862e5070aeb99a19e496625200e8dfac93 sha512sums = 299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5 sha512sums = 0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7 sha512sums = 2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc @@ -133,9 +133,9 @@ pkgname = systemd-selinux optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 provides = nss-myhostname - provides = systemd-tools=248.2 - provides = udev=248.2 - provides = systemd=248.2-2 + provides = systemd-tools=248.3 + provides = udev=248.3 + provides = systemd=248.3-2 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev @@ -173,7 +173,7 @@ pkgname = systemd-libs-selinux provides = libsystemd.so provides = libudev.so provides = libsystemd-selinux - provides = systemd-libs=248.2-2 + provides = systemd-libs=248.3-2 conflicts = libsystemd conflicts = libsystemd-selinux conflicts = systemd-libs @@ -185,16 +185,16 @@ pkgname = systemd-resolvconf-selinux depends = systemd-selinux provides = openresolv provides = resolvconf - provides = systemd-resolvconf=248.2-2 + provides = systemd-resolvconf=248.3-2 conflicts = openresolv - conflicts = systemd-resolvconf=248.2-2 + conflicts = systemd-resolvconf=248.3-2 pkgname = systemd-sysvcompat-selinux pkgdesc = sysvinit compat for systemd with SELinux support license = GPL2 depends = systemd-selinux - provides = systemd-sysvcompat=248.2-2 - provides = selinux-systemd-sysvcompat=248.2-2 + provides = systemd-sysvcompat=248.3-2 + provides = selinux-systemd-sysvcompat=248.3-2 conflicts = sysvinit conflicts = systemd-sysvcompat conflicts = selinux-systemd-sysvcompat @@ -10,8 +10,8 @@ pkgbase=systemd-selinux pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux') -_tag='bc3ad898fc7b74e818c80fdb7b14a3b9c6d91475' # git rev-parse v${_tag_name} -_tag_name=248.2 +_tag='fd9ad7d3bc35a3633b99edac14ff2a4fb10599b7' # git rev-parse v${_tag_name} +_tag_name=248.3 pkgver="${_tag_name/-/}" pkgrel=2 arch=('x86_64') @@ -58,7 +58,7 @@ sha512sums=('SKIP' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' - '869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323' + '217a9dc3f9d8cd0c9fee54f777396f5a270c2e8a30c572ce5f635165adadcec275af0dae1456019cedb9cc93b7cef0862e5070aeb99a19e496625200e8dfac93' '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5' '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7' '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc' diff --git a/systemd-hook b/systemd-hook index 6f2e899234cf..0a4754b21647 100644 --- a/systemd-hook +++ b/systemd-hook @@ -1,6 +1,14 @@ #!/bin/sh -e +is_chrooted() { + if systemd-detect-virt --chroot; then + echo >&2 " Skipped: Running in chroot." + exit 0 + fi +} + systemd_live() { + is_chrooted if [ ! -d /run/systemd/system ]; then echo >&2 " Skipped: Current root is not booted." exit 0 @@ -8,6 +16,7 @@ systemd_live() { } udevd_live() { + is_chrooted if [ ! -d /run/udev ]; then echo >&2 " Skipped: Device manager is not running." exit 0 |