X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-netboot%2Frecipes-core%2Finitramfs-netboot%2Ffiles%2Finit.sh;h=d31988fd67bf1f1c7563436f9db2c8ea564154d2;hb=00fe48518f4ce3ec40af041e36bd2cb7c70e4271;hp=81c2c79a488d8fbc8145af51df5e2a58a0fb5111;hpb=d96d6bdc5399ab257e482248682c6d90dac7d9ae;p=AGL%2Fmeta-agl.git

diff --git a/meta-netboot/recipes-core/initramfs-netboot/files/init.sh b/meta-netboot/recipes-core/initramfs-netboot/files/init.sh
index 81c2c79a4..d31988fd6 100644
--- a/meta-netboot/recipes-core/initramfs-netboot/files/init.sh
+++ b/meta-netboot/recipes-core/initramfs-netboot/files/init.sh
@@ -122,13 +122,16 @@ log_info "Switching to new rootfs"
 mkdir -p run/initramfs
 pivot_root . run/initramfs || bail_out "pivot_root failed."
 
-# workaround for connman (avoid bringing down the network interface used for booting)
+# workaround for connman (avoid bringing down the network interface used for booting, disable DNS proxy)
 if [[ -f /lib/systemd/system/connman.service ]]; then
 	log_info "Adjusting Connman configuration"
 	iface=$(ip -o link show up | tr ':' ' ' | awk '{print $2}' | grep -v -e "^lo$" | head -1)
-	sed -i "s|connmand -n\$|connmand -n -I $iface|g" /lib/systemd/system/connman.service
+	sed -i "s|connmand -n\$|connmand -r -n -I $iface|g" /lib/systemd/system/connman.service
 fi
 
+# also use /proc/net/pnp to generate /etc/resolv.conf
+grep -v bootserver /proc/net/pnp | sed 's/^domain/search/g' >/etc/resolv.conf
+
 # finally, run systemd
 check_debug "Debug point 2. Exit to continue initrd script (run systemd)."