From e8d8c5e97440cd7ac11ad079a90b1d7073e2b738 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 24 Jun 2014 21:45:49 -0300
Subject: filesystem-2014.06-2: updating revision

* add systemd-bus-proxy user/group for systemd 214
* add systemd-* users to stock shadow file (FS#40800 => https://bugs.archlinux.org/task/40800)
* run pwdconv/grpconv if we touch passwd/group, respecitively (FS#40800 => https://bugs.archlinux.org/task/40800)
* add systemd-resolve user/group
---
 libre/filesystem/filesystem.install | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'libre/filesystem/filesystem.install')

diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 7a43b24df..2ce661725 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -1,14 +1,14 @@
 # args: <group> [options]
 _addgroup() {
-	if ! getent group "$1" >/dev/null; then
-		groupadd "$@" >/dev/null
+	if ! getent group "$1" >/dev/null && groupadd "$@" >/dev/null; then
+		need_group_update=1
 	fi
 }
 
 # args: <group> [options]
 _adduser() {
-	if ! getent passwd "$1" >/dev/null; then
-		useradd "$@" >/dev/null
+	if ! getent passwd "$1" >/dev/null && useradd "$@" >/dev/null; then
+		need_passwd_update=1
 	fi
 }
 
@@ -40,12 +40,20 @@ post_upgrade() {
 	_adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin
 	_addgroup systemd-network -g 193
 	_adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin
+	_addgroup systemd-bus-proxy -g 194
+	_adduser systemd-bus-proxy -u 194 -g 194 -d / -s /usr/bin/nologin
+	_addgroup systemd-resolve -g 195
+	_adduser systemd-resolve -u 195 -g 195 -d / -s /usr/bin/nologin
 
-	# sync gshadow to group (fixes FS#19869)
-	if ! grep -q '^lock:' etc/gshadow; then
+	# update shadow files if needed
+	if (( need_group_update )); then
 		grpconv >/dev/null
 	fi
 
+	if (( need_passwd_update )); then
+		pwconv >/dev/null
+	fi
+
 	if ! grep -q '^include /etc/ld.so.conf.d/\*.conf$' etc/ld.so.conf; then
 		echo 'include /etc/ld.so.conf.d/*.conf' >> etc/ld.so.conf
 	fi
-- 
cgit v1.2.3