From: John Bowler <jbowler@nslu2-linux.org>
Date: Tue, 19 Jul 2005 17:24:13 +0000 (+0000)
Subject: unmountflash would make /dev/mtdblock4 on / ro, this only affects a turnup
X-Git-Tag: Release-2010-05/1~9453^2~4121^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ab7f05441d3c14635f711518792e0ef4058ccb7;p=openembedded.git

unmountflash would make /dev/mtdblock4 on / ro, this only affects a turnup
when the flash file system is mounted on /, but it causes the edit of the
/linuxrc to fail.
---

diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions
index 43b109977d..55f3397462 100755
--- a/packages/openslug-init/openslug-init-0.10/functions
+++ b/packages/openslug-init/openslug-init-0.10/functions
@@ -307,8 +307,9 @@ umountflash() {
 
 		# handle this entry, since this is currently only used for unmounting
 		# the flash root partition we know a file which must exist...
-		case "$type" in
-		jffs2)	test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" ||
+		case "$mp/$type" in
+		//jffs2);; # skip /
+		*/jffs2)test "$(devio "<<$mp/etc/init.d/sysconfsetup" prd 2>/dev/null)" -ne "$ffsno" ||
 			umount "$mp" || {
 				echo "$0: $mp: unable to umount $ffsdev" >&2
 				return 1
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index fd2080ff65..e26b118a6a 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r40"
+PR = "r41"
 
 SRC_URI = "file://linuxrc \
 	   file://boot/flash \