git://git.jankratochvil.net
/
captive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rather warn on failed create of the user/group.
[captive.git]
/
captive.spec.in
diff --git
a/captive.spec.in
b/captive.spec.in
index
0fa4800
..
fb40beb
100644
(file)
--- a/
captive.spec.in
+++ b/
captive.spec.in
@@
-212,19
+212,22
@@
rm -rf $RPM_BUILD_ROOT
%pre fuse
%endif
%if %{static}
%pre fuse
%endif
%if %{static}
-/usr/sbin/groupadd -r fuse 2>/dev/null || \
- /usr/sbin/groupadd fuse 2>/dev/null || \
- true
+/usr/sbin/groupadd -r fuse 2>/dev/null || \
+ /usr/sbin/groupadd fuse 2>/dev/null || \
+ /usr/sbin/adduser --quiet --system --no-create-home fuse 2>/dev/null || \
+ echo >&2 "WARNING: Failed to create system group: fuse"
%endif
%post
/sbin/ldconfig
%endif
%post
/sbin/ldconfig
-/usr/sbin/groupadd -r captive 2>/dev/null || \
- /usr/sbin/groupadd captive 2>/dev/null || \
- true
+/usr/sbin/groupadd -r captive 2>/dev/null || \
+ /usr/sbin/groupadd captive 2>/dev/null || \
+ /usr/sbin/addgroup --system --quiet captive 2>/dev/null || \
+ echo >&2 "WARNING: Failed to create system group: captive"
/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 || \
/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
+ /usr/sbin/adduser --quiet --system --no-create-home --home %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
+ echo >&2 "WARNING: Failed to create system user: captive"
%if ! %{static}
%post fuse
%if ! %{static}
%post fuse