From 06547d994eceae01df83fe6065cb4290a8a1e719 Mon Sep 17 00:00:00 2001
From: Alexis Mousset <alexis.mousset@normation.com>
Date: Tue, 23 Jan 2018 15:54:52 +0100
Subject: [PATCH] Fixes #12030: Only stop jetty in preinst during upgrades

---
 rudder-jetty/SPECS/rudder-jetty.spec | 7 ++++++-
 rudder-jetty/debian/preinst          | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rudder-jetty/SPECS/rudder-jetty.spec b/rudder-jetty/SPECS/rudder-jetty.spec
index 3685f4830..cfab70700 100644
--- 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
index 18ff32a72..9e5878f64 100755
--- 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