From a59e7ea360a553203864dafb06a4925f4a64a0d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri.lebouder@enovance.com>
Date: Fri, 17 Oct 2014 10:19:32 +0200
Subject: [PATCH] systemd: always use /lib/systemd

Debian and Ubuntu use /lib/systemd whereas Fedora usr /usr/lib/systemd as the
default system unit directory. This already leads to conflict when the
debian-systemd is used.

Fedora provides a symbolic link between /lib/systemd and /usr/lib/systemd
to also support /lib/systemd directory. With this patch, we use /lib/systemd
everywhere.

This patch supersedes I413a92284e6a79e7fcdde99c5138bc3ce8e85e80.

Change-Id: I459f7514ab35082d31607968252a9005fa25de2a
See: https://bugs.debian.org/719634
---
 elements/os-svc-install/bin/os-svc-daemon             | 4 ++--
 elements/rabbitmq-server/install.d/20-rabbitmq-server | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/elements/os-svc-install/bin/os-svc-daemon b/elements/os-svc-install/bin/os-svc-daemon
index a0b2e4301..fd5ff0bd6 100755
--- a/elements/os-svc-install/bin/os-svc-daemon
+++ b/elements/os-svc-install/bin/os-svc-daemon
@@ -156,7 +156,7 @@ function install_systemd {
 Environment=}
     fi
 
-    $OUTPUT /usr/lib/systemd/system/$name.service <<EOF
+    $OUTPUT /lib/systemd/system/$name.service <<EOF
 [Unit]
 Description=$name Service
 After=os-refresh-config.service
@@ -179,7 +179,7 @@ function install_create_dir_systemd {
     local user=$2
     local dirname=${3:-$user}
 
-    $OUTPUT /usr/lib/systemd/system/$name-create-dir.service <<EOF
+    $OUTPUT /lib/systemd/system/$name-create-dir.service <<EOF
 [Unit]
 Description=Create /var/run/$dirname
 
diff --git a/elements/rabbitmq-server/install.d/20-rabbitmq-server b/elements/rabbitmq-server/install.d/20-rabbitmq-server
index 81dbe784b..f7e33d819 100755
--- a/elements/rabbitmq-server/install.d/20-rabbitmq-server
+++ b/elements/rabbitmq-server/install.d/20-rabbitmq-server
@@ -46,10 +46,10 @@ fi
 
 if [ "$DIB_INIT_SYSTEM" = "systemd" ]; then
     # Delay the rc-local.service start-up until rabbitmq-server.service is started up
-    sed -i 's/\[Unit\]/\[Unit\]\nBefore=rc-local.service/g' /usr/lib/systemd/system/rabbitmq-server.service
+    sed -i 's/\[Unit\]/\[Unit\]\nBefore=rc-local.service/g' /lib/systemd/system/rabbitmq-server.service
 
     # Respawn rabbitmq-server in case the process exits with an nonzero exit code
-    sed -i 's/\[Service\]/\[Service\]\nRestart=on-failure/g' /usr/lib/systemd/system/rabbitmq-server.service
+    sed -i 's/\[Service\]/\[Service\]\nRestart=on-failure/g' /lib/systemd/system/rabbitmq-server.service
 fi