From 220a96f9926788ed531717f78e44fdf1e7ab3b34 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 30 Dec 2010 22:45:29 +0100
Subject: rework architecture / embedded systems concept

Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs

I promise, this is the last big fat commit this year ;)
---
 package/cfgfs/src/fwcf.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'package/cfgfs/src/fwcf.sh')

diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh
index 6f99393dd..ddcbfcc50 100644
--- a/package/cfgfs/src/fwcf.sh
+++ b/package/cfgfs/src/fwcf.sh
@@ -125,7 +125,10 @@ fi
 
 # find backend device, first try to find partition with ID 88
 rootdisk=$(readlink /dev/root)
-part=$(fdisk -l /dev/${rootdisk%1}|awk '$5 == 88 { print $1 }')
+# strip partitions (f.e. mmcblk0p2, sda2, ..)
+rootdisk=${rootdisk%p*}
+rootdisk=${rootdisk%[1-9]}
+part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { print $1 }')
 if [ -z $part ]; then
 	# otherwise search for MTD device with name cfgfs
 	part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd\([^:]*\):.*$/\1/')ro
-- 
cgit v1.2.3