From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 12 Aug 2011 03:35:56 +0000 (+0000)
Subject: [backfire] fix block-extroot on brcm-2.4 (#9454)
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=ef1ac95fc4573a604d0f854fd87b7032aa517621;hp=9eae7d0c564ff72beb5208d9211128204bdf94e9

[backfire] fix block-extroot on brcm-2.4 (#9454)


git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@27964 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/block-extroot/Makefile b/package/block-extroot/Makefile
index 05d5e18a1..69a070ecd 100644
--- a/package/block-extroot/Makefile
+++ b/package/block-extroot/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=block-extroot
 PKG_VERSION:=0.0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=2.1
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/block-extroot/files/extmount.sh b/package/block-extroot/files/extmount.sh
index f696324f7..337951ca0 100644
--- a/package/block-extroot/files/extmount.sh
+++ b/package/block-extroot/files/extmount.sh
@@ -19,7 +19,11 @@ er_load_modules() {
 	ln -sf /lib/modules/*/* /tmp/overlay/lib/modules/*/* /tmp/extroot_modules/modules
     	local modules="$(grep -l '# May be required for rootfs' /tmp/extroot_modules/modules.d/*)"
 	cd /tmp/extroot_modules/modules && {
-		cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || :
+		module_suffix=ko
+		case "$(uname -r)" in
+			2.4.*) module_suffix=o ;;
+		esac
+		cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.'$module_suffix'/'| sh 2>&- || :
 	}
 	rm -rf /tmp/extroot_modules
 }