summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-07-19 22:29:02 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-19 22:29:02 +0000
commit70f1c204b65ebfc97628c76520c0e2c1aed19f40 (patch)
tree3e8c31cfd335c7d3588740b30eae4e9f51045b50
parent897c5ef1fa31b889875a63356f22c1502be45081 (diff)
parent0ab7f05441d3c14635f711518792e0ef4058ccb7 (diff)
merge of 3a43238b0a602039ba26a7418ed911eaee3d4748
and 76ec428e36a1ce1f16ed827eb407369786c2a706
-rwxr-xr-xpackages/openslug-init/openslug-init-0.10/functions5
-rw-r--r--packages/openslug-init/openslug-init_0.10.bb2
2 files changed, 4 insertions, 3 deletions
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 \