KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

package/blockmount: simplify extroot module loading logic

Browse source 
SVN-Revision: 28650
This commit is contained in:
Nicolas Thill 2011-10-28 13:10:50 +00:00
parent b5af64c529
commit 3bcb16b305
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/kernel.mk
View file

@ -90,7 +90,8 @@ define ModuleAutoLoad
done; \ done; \
if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \ if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \
if [ "$$$$$$$$boot" = "1" ]; then \ if [ "$$$$$$$$boot" = "1" ]; then \
echo '# May be required for rootfs' >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ mkdir -p $(2)/etc/modules-boot.d; \
ln -s ../modules.d/$$$$$$$$priority-$(1) $(2)/etc/modules-boot.d/; \
fi; \ fi; \
modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \ modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \
fi; \ fi; \

6
package/block-mount/Makefile
View file

@ -1,6 +1,6 @@
# #
# Copyright (C) 2006-2009 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
# Copyright 2010 Vertical Communications # Copyright (C) 2010 Vertical Communications
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
# #
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=block-mount PKG_NAME:=block-mount
PKG_VERSION:=0.2.0 PKG_VERSION:=0.2.0
PKG_RELEASE:=6 PKG_RELEASE:=7
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

7
package/block-mount/files/extmount.sh
View file

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright 2010 Vertical Communications # Copyright (C) 2006-2011 OpenWrt.org
# Copyright (C) 2010 Vertical Communications
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -15,9 +16,9 @@ set_jffs_mp() {
er_load_modules() { er_load_modules() {
mkdir -p /tmp/extroot_modules/modules.d mkdir -p /tmp/extroot_modules/modules.d
mkdir -p /tmp/extroot_modules/modules mkdir -p /tmp/extroot_modules/modules
ln -sf /etc/modules.d/* /tmp/overlay/etc/modules.d/* /tmp/extroot_modules/modules.d cp -L /etc/modules-boot.d/* /tmp/overlay/etc/modules-boot.d/* /tmp/extroot_modules/modules.d
ln -sf /lib/modules/*/* /tmp/overlay/lib/modules/*/* /tmp/extroot_modules/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/* 2>/dev/null)" local modules="$(cat /tmp/extroot_modules/modules.d/* 2>/dev/null)"
cd /tmp/extroot_modules/modules && [ -n "$modules" ] && { cd /tmp/extroot_modules/modules && [ -n "$modules" ] && {
cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || : cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || :
} }