From: cshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 5 Apr 2011 12:12:57 +0000 (+0000)
Subject: [package] block-mount base-files:  Added additional check to pi_include to ensure... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/198ea09e92556752658bbfffac2b764b6f80959c

[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.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26479 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index acea61753..e4b3badb4 100755
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -299,13 +299,17 @@ pi_include() {
 	elif [ -f "$1" ]; then
 		. "$1"
 	elif [ -d "/tmp/overlay/$1" ]; then
-		for src_script in /tmp/overlay/$1/*.sh; do
-			. "$src_script"
-		done
+		if [ -n "$(ls /tmp/overlay/$1/*.sh 2>/dev/null)" ]; then
+			for src_script in /tmp/overlay/$1/*.sh; do
+				. "$src_script"
+			done
+		fi
 	elif [ -d "$1" ]; then
-		for src_script in $1/*.sh; do
-			. "$src_script"
-		done
+		if [ -n "$(ls $1/*.sh 2>/dev/null)" ]; then
+			for src_script in $1/*.sh; do
+				. "$src_script"
+			done
+		fi
 	else
 		echo "WARNING: $1 not found"
 		return 1
diff --git a/package/block-mount/Makefile b/package/block-mount/Makefile
index d2313f77f..c2c9d33f1 100644
--- a/package/block-mount/Makefile
+++ b/package/block-mount/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=block-mount
 PKG_VERSION:=0.2.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -50,7 +50,7 @@ define Package/block-mount/install
 	$(INSTALL_BIN) ./files/fstab.init $(1)/etc/init.d/fstab
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/fstab.config $(1)/etc/config/fstab
-	$(INSTALL_DIR) $(1)/lib/functions
+	$(INSTALL_DIR) $(1)/lib/functions/fsck
 	$(INSTALL_DATA) ./files/mount.sh $(1)/lib/functions/
 	$(INSTALL_DATA) ./files/fsck.sh $(1)/lib/functions/
 	$(INSTALL_DATA) ./files/block.sh $(1)/lib/functions/