Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash
IFACE=$1
STATUS=$2
case "$STATUS" in
up)
logger -s "NM local-dns-prepender triggered by ${1} ${2}."
DNS_IP="127.0.0.1"
set +e
logger -s "NM local-dns-prepender: Checking if local DNS IP is the first entry in resolv.conf"
if grep nameserver /etc/resolv.conf | head -n 1 | grep -q "$DNS_IP" ; then
logger -s "NM local-dns-prepender: local DNS IP already is the first entry in resolv.conf"
exit 0
else
logger -s "NM local-dns-prepender: Looking for '# Generated by NetworkManager' in /etc/resolv.conf to place 'nameserver $DNS_IP'"
sed -i "/^# Generated by.*$/a nameserver $DNS_IP" /etc/resolv.conf
fi
;;
*)
;;
esac
7 changes: 0 additions & 7 deletions data/data/bootstrap/baremetal/files/etc/dhcp/dhclient.conf

This file was deleted.

3 changes: 2 additions & 1 deletion pkg/asset/ignition/bootstrap/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,11 @@ func (a *Bootstrap) addStorageFiles(base string, uri string, templateData *boots
}

filename := path.Base(uri)
parentDir := path.Base(path.Dir(uri))

var mode int
appendToFile := false
if path.Base(path.Dir(uri)) == "bin" {
if parentDir == "bin" || parentDir == "dispatcher.d" {
mode = 0555
} else if filename == "motd" {
mode = 0644
Expand Down