openstack/diskimage-builder
Code Issues Proposed changes

Depend on ifupdown in simple-init

Browse Source 
Newer distros, such as debian jessie and ubuntu xenial, do not provide
ifupdown by default, but simple-init depends on it. Add it to the pile.

Change-Id: I6f4876863c67c65a82464d4e0593015cdc839c5c
This commit is contained in:
Monty Taylor 2016-02-18 13:20:48 +00:00
parent 352e58ceb7
commit 74487a383c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elements/dib-init-system/dib-init-system
View File

@ -6,7 +6,9 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
if [[ -f /sbin/initctl ]]; then if [[ -f /usr/bin/systemctl ]]; then
echo "systemd"
elif [[ -f /sbin/initctl ]]; then
echo "upstart" echo "upstart"
elif [[ -f /etc/gentoo-release ]]; then elif [[ -f /etc/gentoo-release ]]; then
if [[ "${GENTOO_PROFILE}" =~ systemd ]]; then if [[ "${GENTOO_PROFILE}" =~ systemd ]]; then
@ -14,8 +16,6 @@ elif [[ -f /etc/gentoo-release ]]; then
else else
echo "openrc" echo "openrc"
fi fi
elif [[ -f /usr/bin/systemctl ]]; then
echo "systemd"
elif [[ -f /sbin/init ]]; then elif [[ -f /sbin/init ]]; then
if [[ -f /bin/systemd ]]; then if [[ -f /bin/systemd ]]; then
echo "systemd" echo "systemd"

1
elements/simple-init/package-installs.yaml
View File

@ -1,2 +1,3 @@
isc-dhcp-client: isc-dhcp-client:
net-tools: net-tools:
ifupdown:

6
elements/simple-init/pkg-map
View File

@ -4,7 +4,8 @@
"isc-dhcp-client": "dhclient" "isc-dhcp-client": "dhclient"
}, },
"debian": { "debian": {
"isc-dhcp-client": "isc-dhcp-client" "isc-dhcp-client": "isc-dhcp-client",
"ifupdown": "ifupdown"
}, },
"gentoo": { "gentoo": {
"isc-dhcp-client": "net-misc/dhcp", "isc-dhcp-client": "net-misc/dhcp",
@ -13,6 +14,7 @@
} }
}, },
"default": { "default": {
"isc-dhcp-client": "isc-dhcp-client" "isc-dhcp-client": "isc-dhcp-client",
"ifupdown": ""
} }
} }