From d1ff86363b74103a4ac8185da9f9fdb9763fe8f0 Mon Sep 17 00:00:00 2001
From: Yurii Kolesnykov <root@yurikoles.com>
Date: Wed, 15 Jul 2020 06:32:35 +0300
Subject: sync from official repo

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
---
 initcpio-install-systemd | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'initcpio-install-systemd')

diff --git a/initcpio-install-systemd b/initcpio-install-systemd
index 8fb4441..9e23070 100644
--- a/initcpio-install-systemd
+++ b/initcpio-install-systemd
@@ -69,10 +69,13 @@ add_systemd_unit() {
                 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
+                # do not add binaries unless they are required,
+                # strip special executable prefixes
+                case ${values[0]} in
+                    -*)  ;;
+                    !!*) add_binary "${values[0]#!!}" ;;
+                    *)   add_binary "${values[0]#[@!:+]}" ;;
+                esac
                 ;;
         esac
 
@@ -110,6 +113,7 @@ build() {
     add_binary /usr/bin/sulogin
 
     map add_binary \
+        /usr/bin/journalctl \
         /usr/bin/systemd-tmpfiles \
         /usr/lib/systemd/systemd-hibernate-resume \
         /usr/lib/systemd/systemd-shutdown \
@@ -118,9 +122,6 @@ build() {
         /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
         /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
 
-    # for journalctl in emergency shell
-    add_binary journalctl
-
     # udev rules and systemd units
     map add_udev_rule "$rules" \
             50-udev-default.rules \
@@ -171,15 +172,9 @@ build() {
         '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
+    echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd"
+    echo 'root:*:::::::' >"$BUILDROOT/etc/shadow"
+    getent group root audio disk input kmem kvm lp optical render storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
 
     add_dir "/etc/modules-load.d"
     (
-- 
cgit v1.2.3-70-g09d2