openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Install ndisc6 package in element script"

This commit is contained in:
Zuul 2019-12-03 22:41:09 +00:00 committed by Gerrit Code Review
parent 9b00377f31 7948fee7e2
commit 68b41854b2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,17 @@ set -o pipefail
SCRIPTDIR=$(dirname $0) SCRIPTDIR=$(dirname $0)
# TODO(hjensas): Once ndisc6 package is available in EPEL8 drop this, and add the package back in pkg-map.
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1779134
if [ -e "/etc/redhat-release" ]; then
if type dnf &>/dev/null; then
dnf -v -y install ndisc6 || true
else
yum -v -y install ndisc6 || true
fi
fi
# this script is not needed on Gentoo. # this script is not needed on Gentoo.
if [ "$DISTRO_NAME" != "gentoo" ]; then if [ "$DISTRO_NAME" != "gentoo" ]; then
install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.sh /usr/local/sbin/dhcp-all-interfaces.sh install -D -g root -o root -m 0755 ${SCRIPTDIR}/dhcp-all-interfaces.sh /usr/local/sbin/dhcp-all-interfaces.sh

2
diskimage_builder/elements/dhcp-all-interfaces/pkg-map
View File

@ -2,7 +2,7 @@
"family": { "family": {
"redhat": { "redhat": {
"dhcp-client": "dhclient", "dhcp-client": "dhclient",
"ndisc6": "ndisc6" "ndisc6": ""
}, },
"gentoo": { "gentoo": {
"dhcp-client": "net-misc/dhcpcd", "dhcp-client": "net-misc/dhcpcd",