diff options
| author | John Crispin <blogic@openwrt.org> | 2015-04-10 20:39:44 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-04-10 20:39:44 +0000 |
| commit | e7eaef8bc0da33f88099bcd197d7a52ea724734a (patch) | |
| tree | cd70f339e5764a98abcd08532a1a7e3abcca51c1 | |
| parent | 30be2eb4c468fabacf1f850718d1a55f39df8c9e (diff) | |
| download | upstream-e7eaef8bc0da33f88099bcd197d7a52ea724734a.tar.gz upstream-e7eaef8bc0da33f88099bcd197d7a52ea724734a.tar.bz2 upstream-e7eaef8bc0da33f88099bcd197d7a52ea724734a.zip | |
modules: fix postinst generation for kernel modules
Fixes ticket #19352.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45367 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel.mk | 12 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 11 |
2 files changed, 13 insertions, 10 deletions
diff --git a/include/kernel.mk b/include/kernel.mk index 700736fe9a..300da0d50b 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -97,7 +97,7 @@ define ModuleAutoLoad mkdir -p $(2)/etc/modules-boot.d; \ ln -s ../modules.d/$(1) $(2)/etc/modules-boot.d/; \ fi; \ - modules="$$$$$$$${modules:+$$$$$$$$modules}"; \ + modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$mods"; \ fi; \ }; \ add_module() { \ @@ -121,11 +121,11 @@ define ModuleAutoLoad if [ -n "$$$$$$$$modules" ]; then \ mkdir -p $(2)/etc/modules.d; \ mkdir -p $(2)/CONTROL; \ - echo "#!/bin/sh" > $(2)/CONTROL/postinst; \ - echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \ - echo ". /lib/functions.sh" >> $(2)/CONTROL/postinst; \ - echo "insert_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst; \ - chmod 0755 $(2)/CONTROL/postinst; \ + echo "#!/bin/sh" > $(2)/CONTROL/postinst-pkg; \ + echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst-pkg; \ + echo ". /lib/functions.sh" >> $(2)/CONTROL/postinst-pkg; \ + echo "insert_modules $$$$$$$$modules" >> $(2)/CONTROL/postinst-pkg; \ + chmod 0755 $(2)/CONTROL/postinst-pkg; \ fi endef diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index dc3b80534b..72d954db3c 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -154,10 +154,13 @@ config_list_foreach() { } insert_modules() { - [ -d /etc/modules.d ] && { - cd /etc/modules.d - sed 's/^[^#]/insmod &/' $* | ash 2>&- || : - } + for m in $*; do + if [ -f /etc/modules.d/$m ]; then + sed 's/^[^#]/insmod &/' /etc/modules.d/$m | ash 2>&- || : + else + modprobe $m + fi + done } default_prerm() { |