0116-UpdateScript-fixes_2.patch 1.4 KB

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