Browse Source

Merge "Install ndisc6 package in element script"

tags/2.31.0
Zuul 2 months ago
parent
commit
68b41854b2
2 changed files with 12 additions and 1 deletions
  1. +11
    -0
      diskimage_builder/elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
  2. +1
    -1
      diskimage_builder/elements/dhcp-all-interfaces/pkg-map

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

@@ -8,6 +8,17 @@ set -o pipefail

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.
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

+ 1
- 1
diskimage_builder/elements/dhcp-all-interfaces/pkg-map View File

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

Loading…
Cancel
Save