From: short <>
Date: Sat, 13 Dec 2003 21:22:29 +0000 (+0000)
Subject: RPM installation compatibility for non-'-r' groupadd(8)/useradd(8).
X-Git-Tag: captive-1_1_4~4
X-Git-Url: https://git.jankratochvil.net/?a=commitdiff_plain;h=8246bc44e1d9cc169aa90dee1b2dcdb864ad9159;p=captive.git

RPM installation compatibility for non-'-r' groupadd(8)/useradd(8).
---

diff --git a/captive.spec.in b/captive.spec.in
index a1a7ec3..ef38363 100644
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -142,8 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/usr/sbin/groupadd -r captive 2>/dev/null || true
-/usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -r -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || true
+/usr/sbin/groupadd -r captive 2>/dev/null || \
+   /usr/sbin/groupadd captive 2>/dev/null || \
+	 true
+/usr/sbin/useradd -r -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
+   /usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
+   true
 
 %postun
 /sbin/ldconfig