From 405ea940cb4d7cbdebd368027181a478f91e6c1c Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 10 Sep 2014 09:55:55 +0200
Subject: [PATCH] add more systemd groups and programs

---
 usr/lib/initcpio/install/arch_base  | 10 +++++-----
 usr/share/archboot/base/etc/group   |  2 ++
 usr/share/archboot/base/etc/gshadow |  2 ++
 usr/share/archboot/base/etc/passwd  |  2 ++
 usr/share/archboot/base/etc/shadow  |  2 ++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/usr/lib/initcpio/install/arch_base b/usr/lib/initcpio/install/arch_base
index 56e7501f0..bec675537 100644
--- a/usr/lib/initcpio/install/arch_base
+++ b/usr/lib/initcpio/install/arch_base
@@ -132,11 +132,11 @@ build ()
     add_full_dir "/etc/dbus-1"
     add_full_dir "/usr/share/dbus-1"
     #systemd files
-    apps="busctl bootctl hostnamectl journalctl kernel-install localectl \
-          loginctl machinectl systemctl systemd-analyze systemd-ask-password \
-          systemd-cat systemd-cgls systemd-cgtop coredumpctl \
-          systemd-delta systemd-detect-virt systemd-inhibit systemd-machine-id-setup \
-          systemd-notify systemd-nspawn systemd-run systemd-stdio-bridge systemd-sysusers systemd-tmpfiles \
+    apps="busctl bootctl coredumpctl hostnamectl journalctl kernel-install localectl \
+          loginctl machinectl networkctl systemctl systemd-analyze systemd-ask-password \
+          systemd-cat systemd-cgls systemd-cgtop  \
+          systemd-delta systemd-detect-virtsystemd-escape systemd-firstboot systemd-inhibit systemd-machine-id-setup \
+          systemd-notify systemd-nspawn systemd-path systemd-run systemd-stdio-bridge systemd-sysusers systemd-tmpfiles \
           systemd-tty-ask-password-agent timedatectl"
     for i in $apps; do
         add_binary "$i"
diff --git a/usr/share/archboot/base/etc/group b/usr/share/archboot/base/etc/group
index 9803beee1..0d03f35aa 100644
--- a/usr/share/archboot/base/etc/group
+++ b/usr/share/archboot/base/etc/group
@@ -41,4 +41,6 @@ systemd-timesync:x:192:
 systemd-network:x:193:
 systemd-bus-proxy:x:194:
 systemd-resolve:x:195:
+systemd-journal-remote:x:996:
+systemd-journal-upload:x:995:
 ldap:x:439:
diff --git a/usr/share/archboot/base/etc/gshadow b/usr/share/archboot/base/etc/gshadow
index 9134ce58c..70a542e3d 100644
--- a/usr/share/archboot/base/etc/gshadow
+++ b/usr/share/archboot/base/etc/gshadow
@@ -38,4 +38,6 @@ systemd-timesync:::
 systemd-network:::
 systemd-bus-proxy:::
 systemd-resolve:::
+systemd-journal-remote:!!::
+systemd-journal-upload:!!::
 ldap:!::
diff --git a/usr/share/archboot/base/etc/passwd b/usr/share/archboot/base/etc/passwd
index 63cbeac9f..89275801c 100644
--- a/usr/share/archboot/base/etc/passwd
+++ b/usr/share/archboot/base/etc/passwd
@@ -4,6 +4,8 @@ systemd-timesync:x:192:192:systemd-timesync:/:/bin/false
 systemd-network:x:193:193:systemd-network:/:/bin/false
 systemd-bus-proxy:x:194:194:systemd-bus-proxy:/:/usr/bin/nologin
 systemd-resolve:x:195:195:systemd-resolve:/:/usr/bin/nologin
+systemd-journal-remote:x:996:996:systemd Journal Remote:/:/sbin/nologin
+systemd-journal-upload:x:995:995:systemd Journal Upload:/:/sbin/nologin
 root:x:0:0:root:/root:/bin/zsh
 rpc:x:32:32:Rpcbind Daemon:/dev/null:/bin/false
 dbus:x:81:81:System message bus:/:/bin/false
diff --git a/usr/share/archboot/base/etc/shadow b/usr/share/archboot/base/etc/shadow
index 9e1208ab0..f9ba692cf 100644
--- a/usr/share/archboot/base/etc/shadow
+++ b/usr/share/archboot/base/etc/shadow
@@ -7,6 +7,8 @@ systemd-timesync:x:14871::::::
 systemd-network:x:14871::::::
 systemd-bus-proxy:x:14871::::::
 systemd-resolve:x:14871::::::
+systemd-journal-remote:!!:16303::::::
+systemd-journal-upload:!!:16303::::::
 ntp:!:15399:0:99999:7:::
 rpc:!:15937::::::
 ldap:!:15176:0:99999:7:::
\ No newline at end of file