
- Add a new element 'guest-agent' for image building. This element is used when dev_mode=false, so that the trove code is downloaded into the image during the building phase rather than during the guest agent initialization. - Improve trovestack sub-command 'build-image'. ./trovestack build-image ${datastore_type} \ ${guest_os} \ ${guest_release} \ ${dev_mode} - Improve documentation. Story: #2005387 Task: #30375 Change-Id: I9d7acbd6a97f8c01b48b0f2cf94398d549d89124
20 lines
589 B
Bash
Executable File
20 lines
589 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
|