openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "systemd: always use /lib/systemd"

Browse Source
This commit is contained in:
Jenkins
2014-10-20 20:55:45 +00:00
committed by Gerrit Code Review
parent 24d919ff0c a59e7ea360
commit e3912ac0bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
elements/os-svc-install/bin/os-svc-daemon
View File

@@ -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

4
elements/rabbitmq-server/install.d/20-rabbitmq-server
View File

@@ -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