Merge branch '2.6-dev' into 2.7-dev

skymysky · May 13, 2015 · 9af301b · 9af301b
2 parents e6a1d3d + bccb0f7
commit 9af301b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pulp-dev.py b/pulp-dev.py
@@ -369,6 +369,9 @@ def install(opts):
         os.system('chmod 3775 /var/www/pub')
         os.system('chown -R apache:apache /var/lib/pulp/published')
 
+        # Reload systemctl daemon
+        os.system('/sbin/systemctl daemon-reload')
+
     if warnings:
         print "\n***\nPossible problems:  Please read below\n***"
         for w in warnings:

diff --git a/pulp.spec b/pulp.spec
@@ -436,6 +436,13 @@ then
   pulp-gen-ca-certificate
 fi
 
+%if %{pulp_systemd} == 1
+  if [ $1 -eq 2 ]; # an upgrade
+  then
+    /sbin/systemctl daemon-reload > /dev/null 2>&1
+  fi
+%endif
+
 %preun server
 # If we are uninstalling
 if [ $1 -eq 0 ] ; then