openstack/project-config
Code Issues Proposed changes

Merge "Let unbound find rc.local on Debian stretch in DIB"

Browse Source
This commit is contained in:
Jenkins 2017-07-20 20:03:30 +00:00 committed by Gerrit Code Review
commit a4c3e6e105
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodepool/elements/nodepool-base/finalise.d/89-unbound
View File

@ -64,7 +64,7 @@ chmod 0644 /var/log/unbound.log
# #
# On Redhat systems, systemd's rc-local service looks for an # On Redhat systems, systemd's rc-local service looks for an
# executable /etc/rc.d/rc.local file to run. On Debian/Ubuntu, the # executable /etc/rc.d/rc.local file to run. On Debian/Ubuntu, the
# eqivalent file is /etc/rc.local. # eqivalent file is /etc/rc.local, which is missing on Debian stretch.
# #
# Centos' systemd package symlinks /etc/rc.local to /etc/rc.d/rc.local # Centos' systemd package symlinks /etc/rc.local to /etc/rc.d/rc.local
# correctly. Fedora, however, does not come with an rc.local file at # correctly. Fedora, however, does not come with an rc.local file at
@ -76,7 +76,7 @@ chmod 0644 /var/log/unbound.log
# details on all this. As at 2016-10-18 is unresolved. # details on all this. As at 2016-10-18 is unresolved.
# #
# [1] https://bugzilla.redhat.com/show_bug.cgi?id=1386052 # [1] https://bugzilla.redhat.com/show_bug.cgi?id=1386052
if [[ ! -e /etc/rc.local ]]; then if [[ ! -e /etc/rc.local ]] && [[ ! -e /etc/debian_version ]]; then
if [[ ! -d /etc/rc.d ]]; then if [[ ! -d /etc/rc.d ]]; then
echo "No rc.local and no rc.d directory! See comments in 89-unbound" echo "No rc.local and no rc.d directory! See comments in 89-unbound"
exit 1 exit 1