Changeset 26479


Ignore:
Timestamp:
2011-04-05T14:12:57+02:00 (6 years ago)
Author:
cshore
Message:

[package] block-mount base-files: Added additional check to pi_include to ensure that a directory used with pi_include actually contains files matching the souring pattern because if not the shell dies due to an empty string in for statement. Added /lib/functions/fsck as an empty dir to block-mount. This combination fixes a warning which generates a lot of bug reports, without panicking the kernel like the last attempt.

Location:
trunk/package
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files/files/etc/functions.sh

    r23110 r26479  
    300300                . "$1" 
    301301        elif [ -d "/tmp/overlay/$1" ]; then 
    302                 for src_script in /tmp/overlay/$1/*.sh; do 
    303                         . "$src_script" 
    304                 done 
     302                if [ -n "$(ls /tmp/overlay/$1/*.sh 2>/dev/null)" ]; then 
     303                        for src_script in /tmp/overlay/$1/*.sh; do 
     304                                . "$src_script" 
     305                        done 
     306                fi 
    305307        elif [ -d "$1" ]; then 
    306                 for src_script in $1/*.sh; do 
    307                         . "$src_script" 
    308                 done 
     308                if [ -n "$(ls $1/*.sh 2>/dev/null)" ]; then 
     309                        for src_script in $1/*.sh; do 
     310                                . "$src_script" 
     311                        done 
     312                fi 
    309313        else 
    310314                echo "WARNING: $1 not found" 
  • trunk/package/block-mount/Makefile

    r26476 r26479  
    1010PKG_NAME:=block-mount 
    1111PKG_VERSION:=0.2.0 
    12 PKG_RELEASE:=4 
     12PKG_RELEASE:=5 
    1313 
    1414include $(INCLUDE_DIR)/package.mk 
     
    5151        $(INSTALL_DIR) $(1)/etc/config 
    5252        $(INSTALL_DATA) ./files/fstab.config $(1)/etc/config/fstab 
    53         $(INSTALL_DIR) $(1)/lib/functions 
     53        $(INSTALL_DIR) $(1)/lib/functions/fsck 
    5454        $(INSTALL_DATA) ./files/mount.sh $(1)/lib/functions/ 
    5555        $(INSTALL_DATA) ./files/fsck.sh $(1)/lib/functions/ 
Note: See TracChangeset for help on using the changeset viewer.