diff --git a/xCAT-genesis-base/oe/meta-xcat-genesis/recipes-connectivity/xcat-genesis-network/files/genesis-bootnic b/xCAT-genesis-base/oe/meta-xcat-genesis/recipes-connectivity/xcat-genesis-network/files/genesis-bootnic index 4aeaeb8be9..1f7808af9f 100755 --- a/xCAT-genesis-base/oe/meta-xcat-genesis/recipes-connectivity/xcat-genesis-network/files/genesis-bootnic +++ b/xCAT-genesis-base/oe/meta-xcat-genesis/recipes-connectivity/xcat-genesis-network/files/genesis-bootnic @@ -13,10 +13,9 @@ LC_ALL=C export LC_ALL cmdline_file=${XCAT_CMDLINE_FILE:-/proc/cmdline} -conf_dir=${XCAT_NM_CONF_DIR:-/etc/NetworkManager/conf.d} -# NetworkManager reads conf.d in name order and a later file wins, so this sorts after -# 15-xcat-genesis-duid.conf, which the DUID is written to. -conf_file=$conf_dir/16-xcat-genesis-bootnic.conf +# NetworkManager.conf(5) does not accept ipv6.method as a [connection] default, so the +# restriction is two connection profiles. The DHCPv6 defaults in conf.d still apply to both. +connection_dir=${XCAT_NM_CONNECTION_DIR:-/etc/NetworkManager/system-connections} log() { logger -t xcat-genesis-bootnic -- "$*" || true @@ -43,18 +42,44 @@ case $mac in *) log "BOOTIF $bootif is not a hardware address, leaving DHCPv6 on every nic"; exit 0 ;; esac -mkdir -p "$conf_dir" || exit 1 -# link-local, not disabled: a secondary nic keeps IPv6 on the link and the node still reports -# it to xcatd for the nic data, it just does not ask for an address the reservation holds. -cat >"$conf_file" <"$connection_dir/xcat-genesis-bootnic.nmconnection" <"$connection_dir/xcat-genesis-secondary.nmconnection" <