[zabbix/f14] fix home dir for the zabbix user (#734496)

Dan Horák sharkcz at fedoraproject.org
Mon Sep 5 16:24:13 UTC 2011


commit 2692ccebb4144f8b1ee1659d5abf41f16c6b2e8a
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 5 17:10:26 2011 +0200

    fix home dir for the zabbix user (#734496)

 zabbix.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/zabbix.spec b/zabbix.spec
index 2fe29c9..402e797 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -428,9 +428,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group zabbix > /dev/null || groupadd -r zabbix
-getent passwd zabbix > /dev/null || \
-    useradd -r -g zabbix -d %{_localstatedir}/lib/%{srcname} -s /sbin/nologin \
+if ! getent passwd zabbix > /dev/null; then
+    useradd -r -g zabbix -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
     -c "Zabbix Monitoring System" zabbix
+else
+    # fix bad home dir introduced in 1.8.6-1
+    usermod -d %{_localstatedir}/lib/%{name} zabbix > /dev/null
+fi
 :
 
 %post server
@@ -607,6 +611,7 @@ fi
 %changelog
 * Mon Sep  5 2011 Dan Horák <dan[at]danny.cz> - 1.8.7-1
 - updated to 1.8.7
+- fix home dir for the zabbix user (#734496)
 
 * Tue Aug  9 2011 Dan Horák <dan[at]danny.cz> - 1.8.6-1
 - updated to 1.8.6 (#729164, #729165)


More information about the scm-commits mailing list