Changeset 28650


Ignore:
Timestamp:
2011-10-28T15:10:50+02:00 (6 years ago)
Author:
nico
Message:

package/blockmount: simplify extroot module loading logic

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/kernel.mk

    r28649 r28650  
    9191                if [ -e $(2)/etc/modules.d/$$$$$$$$priority-$(1) ]; then \ 
    9292                        if [ "$$$$$$$$boot" = "1" ]; then \ 
    93                                 echo '# May be required for rootfs' >> $(2)/etc/modules.d/$$$$$$$$priority-$(1); \ 
     93                                mkdir -p $(2)/etc/modules-boot.d; \ 
     94                                ln -s ../modules.d/$$$$$$$$priority-$(1) $(2)/etc/modules-boot.d/; \ 
    9495                        fi; \ 
    9596                        modules="$$$$$$$${modules:+$$$$$$$$modules }$$$$$$$$priority-$(1)"; \ 
  • trunk/package/block-mount/Makefile

    r27226 r28650  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
    3 # Copyright 2010 Vertical Communications 
     2# Copyright (C) 2006-2011 OpenWrt.org 
     3# Copyright (C) 2010 Vertical Communications 
    44# This is free software, licensed under the GNU General Public License v2. 
    55# See /LICENSE for more information. 
     
    1010PKG_NAME:=block-mount 
    1111PKG_VERSION:=0.2.0 
    12 PKG_RELEASE:=6 
     12PKG_RELEASE:=7 
    1313 
    1414include $(INCLUDE_DIR)/package.mk 
  • trunk/package/block-mount/files/extmount.sh

    r26314 r28650  
    11#!/bin/sh 
    2 # Copyright 2010 Vertical Communications 
     2# Copyright (C) 2006-2011 OpenWrt.org 
     3# Copyright (C) 2010 Vertical Communications 
    34 
    45# This is free software, licensed under the GNU General Public License v2. 
     
    1617        mkdir -p /tmp/extroot_modules/modules.d 
    1718        mkdir -p /tmp/extroot_modules/modules 
    18         ln -sf /etc/modules.d/* /tmp/overlay/etc/modules.d/* /tmp/extroot_modules/modules.d 
     19        cp -L /etc/modules-boot.d/* /tmp/overlay/etc/modules-boot.d/* /tmp/extroot_modules/modules.d 
    1920        ln -sf /lib/modules/*/* /tmp/overlay/lib/modules/*/* /tmp/extroot_modules/modules 
    20         local modules="$(grep -l '# May be required for rootfs' /tmp/extroot_modules/modules.d/* 2>/dev/null)" 
     21        local modules="$(cat /tmp/extroot_modules/modules.d/* 2>/dev/null)" 
    2122        cd /tmp/extroot_modules/modules && [ -n "$modules" ] && { 
    2223                cat $modules | sed -e 's/^\([^#].*\)/insmod \.\/\1.ko/'| sh 2>&- || : 
Note: See TracChangeset for help on using the changeset viewer.