aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/apm821xx/base-files/lib/preinit
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/apm821xx/base-files/lib/preinit')
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh9
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx4
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx2
-rw-r--r--target/linux/apm821xx/base-files/lib/preinit/79_move_config18
4 files changed, 14 insertions, 19 deletions
diff --git a/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh b/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh
deleted file mode 100644
index 5675357533..0000000000
--- a/target/linux/apm821xx/base-files/lib/preinit/01_preinit_do_apm821xx.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-do_apm821xx() {
- . /lib/apm821xx.sh
-
- apm821xx_board_detect
-}
-
-boot_hook_add preinit_main do_apm821xx
diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
index ec540feb84..1a27930d24 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
+++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_iface_mac_apm821xx
@@ -4,8 +4,8 @@ preinit_set_mac_address() {
. /lib/functions.sh
case $(board_name) in
- mr24|\
- mx60)
+ meraki,mr24|\
+ meraki,mx60)
mac_lan=$(mtd_get_mac_binary_ubi board-config 102)
[ -n "$mac_lan" ] && ifconfig eth0 hw ether "$mac_lan"
;;
diff --git a/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx b/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx
index 97ef6dc68f..a15a055a25 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx
+++ b/target/linux/apm821xx/base-files/lib/preinit/05_set_preinit_iface_apm821xx
@@ -1,7 +1,5 @@
#!/bin/sh
-. /lib/apm821xx.sh
-
apm821xx_set_preinit_iface() {
ifname=eth0
}
diff --git a/target/linux/apm821xx/base-files/lib/preinit/79_move_config b/target/linux/apm821xx/base-files/lib/preinit/79_move_config
index 3ca8b0a71c..5d33feb916 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/79_move_config
+++ b/target/linux/apm821xx/base-files/lib/preinit/79_move_config
@@ -5,12 +5,18 @@ BOOTPART=/dev/sda1
move_config() {
. /lib/functions.sh
- [ "$(board_name)" = "mbl" ] || return
- if [ -b $BOOTPART ]; then
- mkdir -p /boot
- mount -t ext4 -o rw,noatime $BOOTPART /boot
- [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
- fi
+ case "$(board_name)" in
+ wd,mybooklive|\
+ wd,mybooklive-duo)
+ if [ -b $BOOTPART ]; then
+ mkdir -p /boot
+ mount -t ext4 -o rw,noatime $BOOTPART /boot
+ [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
+ fi
+ ;;
+ *)
+ ;;
+ esac
}
boot_hook_add preinit_mount_root move_config