Fixes #12030: Only stop jetty in preinst during upgrades

Normation · Jan 23, 2018 · 06547d9 · 06547d9
1 parent 3a6f629
commit 06547d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/rudder-jetty/SPECS/rudder-jetty.spec b/rudder-jetty/SPECS/rudder-jetty.spec
@@ -158,7 +158,12 @@ install -m 644 %{SOURCE4} %{buildroot}/opt/rudder/etc/server-roles.d/
 # Pre Installation
 #=================================================
 
-service rudder-jetty stop
+CFRUDDER_FIRST_INSTALL=$1
+
+if [ ${CFRUDDER_FIRST_INSTALL} -ne 1 ]
+then
+    service rudder-jetty stop
+fi
 
 # Prepare the migration of /etc/default/rudder-jetty
 if [ -e /opt/rudder/etc/rudder-jetty.conf ]

diff --git a/rudder-jetty/debian/preinst b/rudder-jetty/debian/preinst
@@ -17,7 +17,10 @@ set -e
 case "$1" in
     install|upgrade)
 
-        service rudder-jetty stop
+        if [ "$1" = "upgrade" ]
+        then
+          service rudder-jetty stop
+        fi
 
         # Prepare the migration of /etc/default/rudder-jetty
         if [ -f /opt/rudder/etc/rudder-jetty.conf ]; then