0124-remove-interfaces-from-update.patch 4.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143
  1. diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
  2. index 00abca8..a826bc2 100644
  3. --- a/UpdateRootfs.sh.in
  4. +++ b/UpdateRootfs.sh.in
  5. @@ -1,7 +1,7 @@
  6. #!/bin/sh
  7. TMP_PATH="$GFA_PREFIX/__GfA_Update"
  8. -TAR_PARAMETERS="-C $GFA_PREFIX/ --exclude=./tmp --exclude=./etc/inittab --exclude=./etc/hosts --exclude=./etc/hostname --exclude=./etc/passwd --exclude=./etc/shadow --exclude=./etc/vncpwd --exclude=./etc/init.d/S99tincd --exclude=./etc/hostapd.conf --exclude=./root/.ssh --exclude=./etc/init.d/M99tincd --exclude=./var/GfA/Display_GSM.ini --exclude=./var/cron/crontabs/root -xzvf -"
  9. +TAR_PARAMETERS="-C $GFA_PREFIX/ --exclude=./tmp --exclude=./etc/network/interfaces --exclude=./etc/inittab --exclude=./etc/hosts --exclude=./etc/hostname --exclude=./etc/passwd --exclude=./etc/shadow --exclude=./etc/vncpwd --exclude=./etc/init.d/S99tincd --exclude=./etc/hostapd.conf --exclude=./root/.ssh --exclude=./etc/init.d/M99tincd --exclude=./var/GfA/Display_GSM.ini --exclude=./var/cron/crontabs/root -xzvf -"
  10. untar_payload ()
  11. {
  12. @@ -163,12 +163,6 @@ mount $bootpart $GFA_PREFIX/_GfABoot
  13. mkdir -p $TMP_PATH/bu_cfg
  14. -if [ -e $GFA_PREFIX/etc/network/interfaces ]
  15. -then
  16. - cp $GFA_PREFIX/etc/network/interfaces $TMP_PATH/bu_cfg
  17. - rm $GFA_PREFIX/etc/network/interfaces
  18. -fi
  19. -
  20. if [ -e $GFA_PREFIX/etc/wpa_supplicant.conf ]
  21. then
  22. cp $GFA_PREFIX/etc/wpa_supplicant.conf $TMP_PATH/bu_cfg/wpa_supplicant.conf_old
  23. @@ -188,50 +182,6 @@ untar_payload
  24. echo "sync mmc be patient ...."
  25. sync
  26. sync
  27. -# --- copy old eth0 configuration
  28. -INTERFACE="eth0"
  29. -IFCONFIG=$TMP_PATH/bu_cfg/interfaces
  30. -
  31. -(\
  32. -cat << EOF
  33. -# Configure Loopback
  34. -auto lo
  35. -iface lo inet loopback
  36. -
  37. -EOF
  38. -) > $GFA_PREFIX/etc/network/interfaces
  39. -
  40. -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 \
  41. ->> $GFA_PREFIX/etc/network/interfaces
  42. -
  43. -(\
  44. -cat << EOF
  45. -iface eth1 inet dhcp
  46. -#---
  47. -iface usb0 inet static
  48. - address 192.168.7.2
  49. - netmask 255.255.255.252
  50. -#---
  51. -iface wlan0 inet dhcp
  52. - wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
  53. -#
  54. -EOF
  55. -) >> $GFA_PREFIX/etc/network/interfaces
  56. -
  57. -FIXINTERFACES=$(
  58. -cat $GFA_PREFIX/etc/network/interfaces |
  59. -awk '
  60. -{
  61. -# remove old version of resolv.conf filling
  62. -if( ($1 == "post-up") && ($2 == "echo") && ($3 == "\"nameserver")) {
  63. - printf("\tdns-nameservers %s\n", substr($4,1,length($4) - 1));
  64. - } else {
  65. - printf("%s\n", $0);
  66. - }
  67. -
  68. -}'
  69. -)
  70. -echo "$FIXINTERFACES" > $GFA_PREFIX/etc/network/interfaces
  71. if [ -e $GFA_PREFIX/etc/init.d/S98usb_g_ether ]
  72. then
  73. @@ -714,12 +664,6 @@ rm -rf \$TMP_PATH
  74. mkdir -p \$TMP_PATH
  75. mkdir -p \$TMP_PATH/bu_cfg
  76. -if [ -e \$GFA_PREFIX/etc/network/interfaces ]
  77. -then
  78. - cp \$GFA_PREFIX/etc/network/interfaces \$TMP_PATH/bu_cfg
  79. - rm \$GFA_PREFIX/etc/network/interfaces
  80. -fi
  81. -
  82. if [ -e \$GFA_PREFIX/etc/wpa_supplicant.conf ]
  83. then
  84. cp \$GFA_PREFIX/etc/wpa_supplicant.conf \$TMP_PATH/bu_cfg/wpa_supplicant.conf_old
  85. @@ -752,52 +696,6 @@ rsync -avR --exclude=/_GfABoot \\
  86. --exclude=./var/cron/crontabs/root \\
  87. ./ \$EMMC_ROOTPATH/
  88. -# --- copy old eth0 configuration
  89. -INTERFACE="eth0"
  90. -IFCONFIG=\$TMP_PATH/bu_cfg/interfaces
  91. -
  92. -(\\
  93. -cat << EOF
  94. -# Configure Loopback
  95. -auto lo
  96. -iface lo inet loopback
  97. -
  98. -EOF
  99. -) > \$GFA_PREFIX/etc/network/interfaces
  100. -
  101. -
  102. -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 \\
  103. ->> \$GFA_PREFIX/etc/network/interfaces
  104. -
  105. -(\\
  106. -cat << EOF
  107. -iface eth1 inet dhcp
  108. -#---
  109. -iface usb0 inet static
  110. - address 192.168.7.2
  111. - netmask 255.255.255.252
  112. -#---
  113. -iface wlan0 inet dhcp
  114. - wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
  115. -#
  116. -EOF
  117. -) >> \$GFA_PREFIX/etc/network/interfaces
  118. -
  119. -FIXINTERFACES=\$(
  120. -cat \$GFA_PREFIX/etc/network/interfaces |
  121. -awk '
  122. -{
  123. -# remove old version of resolv.conf filling
  124. -if( (\$1 == "post-up") && (\$2 == "echo") && (\$3 == "\"nameserver")) {
  125. - printf("\tdns-nameservers %s\n", substr(\$4,1,length(\$4) - 1));
  126. - } else {
  127. - printf("%s\n", \$0);
  128. - }
  129. -
  130. -}'
  131. -)
  132. -echo "\$FIXINTERFACES" > \$GFA_PREFIX/etc/network/interfaces
  133. -
  134. if [ -e \$GFA_PREFIX/etc/init.d/S98usb_g_ether ]
  135. then
  136. cp \$GFA_PREFIX/etc/init.d/S98usb_g_ether \$GFA_PREFIX/etc/init.d/M98usb_g_ether