~/paste/1260
~/paste/1260
~/paste/1260

  1. commit 6d7b6f295e3907ebfee615508651466eac8d6ecc
  2. Author: Mirko Vogt <daten@ina.(none)>
  3. Date:   Wed Dec 19 16:01:16 2012 +0100
  4.  
  5.     Do not use deprecated path to functions.sh (/etc/functions.sh -> /lib/functions.sh)
  6.  
  7. diff --git a/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand b/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand
  8. index 6cd8d6f..f7e0a09 100755
  9. --- a/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand
  10. +++ b/target/linux/adm5120/rb1xx/base-files/sbin/wget2nand
  11. @@ -6,7 +6,7 @@
  12.  # Licence GPL V2
  13.  # Author david.goodenough@linkchoose.co.uk
  14.  # Based on cf2nand from RB532 support
  15. -. /etc/functions.sh
  16. +. /lib/functions.sh
  17.  
  18.  [ -d /tmp/wget2nand-rootfs ] && {
  19.         echo "/tmp/wget2nand-rootfs already exists"
  20. diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
  21. index c46d093..0fd6813 100644
  22. --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
  23. +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
  24. @@ -11,7 +11,7 @@ ath9k_eeprom_extract() {
  25.         local count=$3
  26.         local mtd
  27.  
  28. -       . /etc/functions.sh
  29. +       . /lib/functions.sh
  30.  
  31.         mtd=$(find_mtd_chardev $part)
  32.         [ -n "$mtd" ] || \
  33. diff --git a/target/linux/ar71xx/base-files/sbin/wget2nand b/target/linux/ar71xx/base-files/sbin/wget2nand
  34. index 56a8ae2..f80eecd 100755
  35. --- a/target/linux/ar71xx/base-files/sbin/wget2nand
  36. +++ b/target/linux/ar71xx/base-files/sbin/wget2nand
  37. @@ -6,7 +6,7 @@
  38.  # Licence GPL V2
  39.  # Author david.goodenough@linkchoose.co.uk
  40.  # Based on cf2nand from RB532 support
  41. -. /etc/functions.sh
  42. +. /lib/functions.sh
  43.  
  44.  wget2nand_dir=/tmp/wget2nand
  45.  mnt_kernel=$wget2nand_dir/mnt_kernel
  46. diff --git a/target/linux/atheros/base-files/etc/hotplug.d/button/00-button b/target/linux/atheros/base-files/etc/hotplug.d/button/00-button
  47. index 857a59b..63cc217 100644
  48. --- a/target/linux/atheros/base-files/etc/hotplug.d/button/00-button
  49. +++ b/target/linux/atheros/base-files/etc/hotplug.d/button/00-button
  50. @@ -1,4 +1,4 @@
  51. -. /etc/functions.sh
  52. +. /lib/functions.sh
  53.  do_button () {
  54.         local button
  55.         local action
  56. diff --git a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm
  57. index da721b8..001f5f4 100644
  58. --- a/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm
  59. +++ b/target/linux/brcm47xx/base-files/lib/preinit/20_failsafe_set_boot_wait_brcm
  60. @@ -1,6 +1,6 @@
  61.  #!/bin/sh
  62.  
  63. -. /etc/functions.sh
  64. +. /lib/functions.sh
  65.  
  66.  set_boot_wait() {
  67.         [ -x "/usr/sbin/nvram" ] && {
  68. diff --git a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  69. index 46be9d3..c03ba4c 100644
  70. --- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  71. +++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  72. @@ -12,7 +12,7 @@ rt2x00_eeprom_extract() {
  73.         local count=$3
  74.         local mtd
  75.  
  76. -       . /etc/functions.sh
  77. +       . /lib/functions.sh
  78.  
  79.         mtd=$(find_mtd_part $part)
  80.         [ -n "$mtd" ] || \
  81. diff --git a/target/linux/generic/base-files/init b/target/linux/generic/base-files/init
  82. index 4705761..b4ef4fe 100755
  83. --- a/target/linux/generic/base-files/init
  84. +++ b/target/linux/generic/base-files/init
  85. @@ -35,7 +35,7 @@ echo "- init -"
  86.  
  87.  # Load the modules we have in initramfs, this should
  88.  # make the media accessible, but, it may take some time
  89. -. /etc/functions.sh
  90. +. /lib/functions.sh
  91.  load_modules /etc/modules /etc/modules.d/*
  92.  
  93.  #wait 10 seconds for the disc to show up
  94. diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  95. index e58ca34..e3509bd 100644
  96. --- a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  97. +++ b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  98. @@ -12,7 +12,7 @@ rt2x00_eeprom_extract() {
  99.         local count=$3
  100.         local mtd
  101.  
  102. -       . /etc/functions.sh
  103. +       . /lib/functions.sh
  104.  
  105.         mtd=$(find_mtd_part $part)
  106.         [ -n "$mtd" ] || \
  107. diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  108. index 32c97fc..21c9f5f 100644
  109. --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  110. +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
  111. @@ -11,7 +11,7 @@ rt2x00_eeprom_extract() {
  112.         local count=$3
  113.         local mtd
  114.  
  115. -       . /etc/functions.sh
  116. +       . /lib/functions.sh
  117.  
  118.         mtd=$(find_mtd_part $part)
  119.         [ -n "$mtd" ] || \
  120. diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
  121. index 5d49923..dadb95b 100755
  122. --- a/target/linux/ramips/base-files/etc/uci-defaults/network
  123. +++ b/target/linux/ramips/base-files/etc/uci-defaults/network
  124. @@ -1,6 +1,6 @@
  125.  #!/bin/sh
  126.  
  127. -. /etc/functions.sh
  128. +. /lib/functions.sh
  129.  . /lib/ramips.sh
  130.  . /lib/functions/uci-defaults.sh
  131.  
  132. diff --git a/target/linux/rb532/base-files/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand
  133. index 60542de..0bfc259 100755
  134. --- a/target/linux/rb532/base-files/sbin/cf2nand
  135. +++ b/target/linux/rb532/base-files/sbin/cf2nand
  136. @@ -1,5 +1,5 @@
  137.  #!/bin/sh
  138. -. /etc/functions.sh
  139. +. /lib/functions.sh
  140.  
  141.  copy_kernel() {
  142.         local input="$1"
  143. diff --git a/target/linux/rb532/base-files/sbin/wget2nand b/target/linux/rb532/base-files/sbin/wget2nand
  144. index 57f4128..9a111fa 100755
  145. --- a/target/linux/rb532/base-files/sbin/wget2nand
  146. +++ b/target/linux/rb532/base-files/sbin/wget2nand
  147. @@ -6,7 +6,7 @@
  148.  # Licence GPL V2
  149.  # Author david.goodenough@linkchoose.co.uk
  150.  # Based on cf2nand from RB532 support
  151. -. /etc/functions.sh
  152. +. /lib/functions.sh
  153.  
  154.  [ -d /tmp/wget2nand ] && {
  155.         echo "/tmp/wget2nand already exists"
  156.  
Language: diff
Posted by Anonymous at 19 Dec 2012, 03:09:07 UTC