From a9929695c6ad0779eaa8cb3d68d37760981d55b7 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 25 Jan 2010 17:11:17 +0000
Subject: add preinit modularization work by Daniel Dickinson (cshore)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19331 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/rdc/base-files/etc/preinit.arch       | 23 ----------------
 .../base-files/lib/preinit/05_set_ether_mac_rdc    | 32 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 23 deletions(-)
 delete mode 100644 target/linux/rdc/base-files/etc/preinit.arch
 create mode 100644 target/linux/rdc/base-files/lib/preinit/05_set_ether_mac_rdc

(limited to 'target/linux/rdc')

diff --git a/target/linux/rdc/base-files/etc/preinit.arch b/target/linux/rdc/base-files/etc/preinit.arch
deleted file mode 100644
index fd456f8b2..000000000
--- a/target/linux/rdc/base-files/etc/preinit.arch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2009 OpenWrt.org
-
-. /etc/functions.sh
-
-insmod r6040
-
-kernel=$(grep magic /proc/mtd | awk -F: '{print $1}')
-[ -n $kernel ] && hdr=$(dd if=/dev/$kernel count=4 bs=1 2> /dev/null)
-[ "$hdr" = "CSYS" ] && config=$(find_mtd_part config)
-if [ -n "$config" ]; then
-	mac0=$(hexdump -n 6 -e '6/1 ":%X"' -s 24583 $config | cut -c2-)
-	[ "$mac0" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac0
-	mac1=$(hexdump -n 6 -e '6/1 ":%X"' -s 24589 $config | cut -c2-)
-	[ "$mac1" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac1
-fi
-if [ -n $mac0 ]; then
-	logger -t kernel -p user.info "r6040: Setting MAC for eth0 to $mac0"
-	ifconfig eth0 hw ether $mac0
-fi
-if [ -n $mac1 ]; then
-	logger -t kernel -p user.info "r6040: Setting MAC for eth1 to $mac1"
-	ifconfig eth1 hw ether $mac1
-fi
diff --git a/target/linux/rdc/base-files/lib/preinit/05_set_ether_mac_rdc b/target/linux/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
new file mode 100644
index 000000000..43823c48e
--- /dev/null
+++ b/target/linux/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
@@ -0,0 +1,32 @@
+#!/bin/sh
+# Copyright (C) 2009 OpenWrt.org
+
+. /etc/boot.sh
+
+r6040_module() {
+	insmod r6040
+}
+
+set_ether_mac() {
+	kernel=$(grep magic /proc/mtd | awk -F: '{print $1}')
+	[ -n $kernel ] && hdr=$(dd if=/dev/$kernel count=4 bs=1 2> /dev/null)
+	[ "$hdr" = "CSYS" ] && config=$(find_mtd_part config)
+	if [ -n "$config" ]; then
+		mac0=$(hexdump -n 6 -e '6/1 ":%X"' -s 24583 $config | cut -c2-)
+		[ "$mac0" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac0
+		mac1=$(hexdump -n 6 -e '6/1 ":%X"' -s 24589 $config | cut -c2-)
+		[ "$mac1" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac1
+	fi
+	if [ -n $mac0 ]; then
+		logger -t kernel -p user.info "r6040: Setting MAC for eth0 to $mac0"
+		ifconfig eth0 hw ether $mac0
+	fi
+	if [ -n $mac1 ]; then
+		logger -t kernel -p user.info "r6040: Setting MAC for eth1 to $mac1"
+		ifconfig eth1 hw ether $mac1
+	fi
+}
+
+boot_hook_add preinit_main r6040_module
+boot_hook_add preinit_main set_ether_mac
+
-- 
cgit v1.2.3