0115-UpdateScript-fixes.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
  2. index 26a41b3..212ef68 100644
  3. --- a/UpdateRootfs.sh.in
  4. +++ b/UpdateRootfs.sh.in
  5. @@ -218,6 +218,21 @@ iface wlan0 inet dhcp
  6. EOF
  7. ) >> $GFA_PREFIX/etc/network/interfaces
  8. +FIXINTERFACES=$(
  9. +cat $GFA_PREFIX/etc/network/interfaces |
  10. +awk '
  11. +{
  12. +# remove old version of resolv.conf filling
  13. +if( ($1 == "post-up") && ($2 == "echo") && ($3 == "\"nameserver")) {
  14. + printf("\tdns-nameservers %s\n", substr($4,1,length($4) - 1));
  15. + } else {
  16. + printf("%s\n", $0);
  17. + }
  18. +
  19. +}'
  20. +)
  21. +echo "$FIXINTERFACES" > $GFA_PREFIX/etc/network/interfaces
  22. +
  23. if [ -e $GFA_PREFIX/etc/init.d/S98usb_g_ether ]
  24. then
  25. cp $GFA_PREFIX/etc/init.d/S98usb_g_ether $GFA_PREFIX/etc/init.d/M98usb_g_ether
  26. @@ -741,6 +756,21 @@ iface lo inet loopback
  27. EOF
  28. ) > \$GFA_PREFIX/etc/network/interfaces
  29. +FIXINTERFACES=\$(
  30. +cat \$GFA_PREFIX/etc/network/interfaces |
  31. +awk '
  32. +{
  33. +# remove old version of resolv.conf filling
  34. +if( (\$1 == "post-up") && (\$2 == "echo") && (\$3 == "\"nameserver")) {
  35. + printf("\tdns-nameservers %s\n", substr(\$4,1,length(\$4) - 1));
  36. + } else {
  37. + printf("%s\n", \$0);
  38. + }
  39. +
  40. +}'
  41. +)
  42. +echo "\$FIXINTERFACES" > \$GFA_PREFIX/etc/network/interfaces
  43. +
  44. 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 \\
  45. >> \$GFA_PREFIX/etc/network/interfaces