[arch-commits] Commit in systemd/trunk (PKGBUILD systemd-hook)

[Christian Hesse]

    Date: Tuesday, May 18, 2021 @ 10:35:47
  Author: eworm
Revision: 415672

upgpkg: systemd 248.3-2: systemd-hook: skip if chroot is detected

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd-hook

--------------+
 PKGBUILD     |    4 ++--
 systemd-hook |    9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-18 10:06:09 UTC (rev 415671)
+++ PKGBUILD	2021-05-18 10:35:47 UTC (rev 415672)
@@ -7,7 +7,7 @@
 _tag='fd9ad7d3bc35a3633b99edac14ff2a4fb10599b7' # git rev-parse v${_tag_name}
 _tag_name=248.3
 pkgver="${_tag_name/-/}"
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -51,7 +51,7 @@
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
             '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
+            '217a9dc3f9d8cd0c9fee54f777396f5a270c2e8a30c572ce5f635165adadcec275af0dae1456019cedb9cc93b7cef0862e5070aeb99a19e496625200e8dfac93'
             '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
             '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
             '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'

Modified: systemd-hook
===================================================================
--- systemd-hook	2021-05-18 10:06:09 UTC (rev 415671)
+++ systemd-hook	2021-05-18 10:35:47 UTC (rev 415672)
@@ -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 @@
 }
 
 udevd_live() {
+  is_chrooted
   if [ ! -d /run/udev ]; then
     echo >&2 "  Skipped: Device manager is not running."
     exit 0