openstack
/
diskimage-builder
Code Issues Proposed changes

Fix dib-init-system for Debian Jessie and Debian Stretch 

On Debian Jessie and Debian Stretch systemctl is in /bin.
If the package systemd-sysv is not installed the script
dib-init-system did not find the init system.
This patch fixes the problem: it also looks in /bin
for systemctl and if found decides for systemd.

Change-Id: I5a18052a070bad5e16b14672237a1e2b38513949
Signed-off-by: Andreas Florath <andreas@florath.net>
This commit is contained in:
Andreas Florath 2017-01-02 22:18:47 +01:00
parent 958ea8a337
commit 20389d755f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diskimage_builder/elements/dib-init-system/dib-init-system
View File

@ -6,7 +6,10 @@ fi
set -eu
set -o pipefail
if [[ -f /usr/bin/systemctl ]]; then
# Debian Jessie and Debian Stretch use /bin/systemctl.
# (/sbin/init is only available if systemd-sysv is installed.)
if [ -f /usr/bin/systemctl -o -f /bin/systemctl ]; then
echo "systemd"
elif [[ -f /sbin/initctl ]]; then
echo "upstart"

6
releasenotes/notes/dib-init-system_fix_for_debian_jessie-c6f7261ee84dad27.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- dib-init-system did not correctly find the
init system for Debian Jessie and Debian Stretch.
This version also looks for /bin/systemctl as
as hint for systemd and fixes the problem.