diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in index 26a41b3..212ef68 100644 --- a/UpdateRootfs.sh.in +++ b/UpdateRootfs.sh.in @@ -218,6 +218,21 @@ iface wlan0 inet dhcp EOF ) >> $GFA_PREFIX/etc/network/interfaces +FIXINTERFACES=$( +cat $GFA_PREFIX/etc/network/interfaces | +awk ' +{ +# remove old version of resolv.conf filling +if( ($1 == "post-up") && ($2 == "echo") && ($3 == "\"nameserver")) { + printf("\tdns-nameservers %s\n", substr($4,1,length($4) - 1)); + } else { + printf("%s\n", $0); + } + +}' +) +echo "$FIXINTERFACES" > $GFA_PREFIX/etc/network/interfaces + if [ -e $GFA_PREFIX/etc/init.d/S98usb_g_ether ] then cp $GFA_PREFIX/etc/init.d/S98usb_g_ether $GFA_PREFIX/etc/init.d/M98usb_g_ether @@ -741,6 +756,21 @@ iface lo inet loopback EOF ) > \$GFA_PREFIX/etc/network/interfaces +FIXINTERFACES=\$( +cat \$GFA_PREFIX/etc/network/interfaces | +awk ' +{ +# remove old version of resolv.conf filling +if( (\$1 == "post-up") && (\$2 == "echo") && (\$3 == "\"nameserver")) { + printf("\tdns-nameservers %s\n", substr(\$4,1,length(\$4) - 1)); + } else { + printf("%s\n", \$0); + } + +}' +) +echo "\$FIXINTERFACES" > \$GFA_PREFIX/etc/network/interfaces + awk -v par=\$INTERFACE '/^iface/ && \$2==par {f=1}/^iface/ && \$2!=par {f=0}f && !/^\s*#/d && !/^\s*\$/d {print \$0 }' \$TMP_PATH/bu_cfg/interfaces \\ >> \$GFA_PREFIX/etc/network/interfaces