c00488143d
Not all Linux flavors accept the same type of configuration to manage NICs. The amphora-agent must be able to distinguish between different Linux flavors and choose the appropriate type of jinja2 NIC configuration template for each one, respectively. Up until now, The amphora-agent had no notion of the operating system it is running on, therefore it used NIC configuration templates that only match Debian based Linux flavors (mostly Ubuntu). Making it unusable for flavors such as RHEL, Fedora and CentOS. This fix enhances how the amphora-agent is handling NIC hot plugs. It will use the appropriate jinja2 template by checking the Amphora distribution name when needed. Co-Authored-By: Michael Johnson <johnsomor@gmail.com> Closes-Bug #1548070 Change-Id: Id99948aec64656a0532afc68e146f0610bff1378
21 lines
588 B
Bash
Executable File
21 lines
588 B
Bash
Executable File
#!/bin/bash
|
|
echo "" > /etc/resolv.conf
|
|
echo "" > /etc/resolv.conf.ORIG
|
|
if [ -d /etc/dhcp/dhclient-enter-hooks.d ]
|
|
then
|
|
# Debian/Ubuntu
|
|
echo "#!/bin/sh
|
|
make_resolv_conf() { : ; }" > /etc/dhcp/dhclient-enter-hooks.d/noresolvconf
|
|
chmod +x /etc/dhcp/dhclient-enter-hooks.d/noresolvconf
|
|
rm -f /etc/dhcp/dhclient-enter-hooks.d/resolvconf
|
|
else
|
|
# RHEL/CentOS/Fedora
|
|
echo "#!/bin/sh
|
|
make_resolv_conf() { : ; }" > /etc/dhclient-enter-hooks
|
|
chmod +x /etc/dhclient-enter-hooks
|
|
fi
|
|
|
|
if [ -e /etc/nsswitch.conf ]; then
|
|
sed -i -e "/hosts:/ s/dns//g" /etc/nsswitch.conf
|
|
fi
|