openstack
/
diskimage-builder
Code Issues Proposed changes

Conditionally add dhcp-all-interfaces 

If the /etc/init drectory gets created on Fedora, it causes
os-svc-daemon to add upstart init scripts instead of systemd.
As a result none of the openstack services can start.

Partial-Bug: #1239880

Change-Id: Iec317baa3eb9ff651fa66c582d2f614993cde45e
This commit is contained in:
Derek Higgins 2013-10-14 23:54:37 +01:00 committed by Robert Collins
parent a019fcf470
commit d23ba2a8a8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
View File

@ -5,5 +5,10 @@
SCRIPTDIR=$(dirname $0)
install -D -g root -o root -m 0755 ${SCRIPTDIR}/generate-interfaces-file.sh /usr/local/sbin/generate-interfaces-file.sh
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.conf /etc/init/dhcp-all-interfaces.conf
# Currently only installed on Debian-derived distributions
# Installing these on Fedora causes problems with os-svc-daemon
# https://bugs.launchpad.net/tripleo/+bug/1239880
if [ -d /etc/init ] ; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/generate-interfaces-file.sh /usr/local/sbin/generate-interfaces-file.sh
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.conf /etc/init/dhcp-all-interfaces.conf
fi