From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 18 Jun 2007 00:06:02 +0000 (+0000)
Subject: initscripts 1.0: ramdisk: Don't bother to screw up randomly found mtdram partition.
X-Git-Tag: Release-2010-05/1~8868^2~335
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f83673e5d989c0259dbf615edaf64a4d6169b46c;p=openembedded.git

initscripts 1.0: ramdisk: Don't bother to screw up randomly found mtdram partition.
* In the sense, that at least try to make sure it's not completely mad. Though likely,
scripts liek this should not be installed by default at all.
---

diff --git a/packages/initscripts/initscripts-1.0/ramdisk b/packages/initscripts/initscripts-1.0/ramdisk
index 03ac9bd05b..4dfe53cf61 100755
--- a/packages/initscripts/initscripts-1.0/ramdisk
+++ b/packages/initscripts/initscripts-1.0/ramdisk
@@ -22,6 +22,9 @@ else
 	RAM_MTDBLK=/dev/mtdblock$RAM_MTD_NO
 fi
 
+if grep -q $RAM_MTDBLK /etc/mtab; then echo "Device $RAM_MTDBLK already mounted"; exit 0; fi
+if test ! -e $RAM_MTD; then echo >&2 "Mtdram device $RAM_MTD does not exist!"; exit 1; fi
+
 RAM_MNTPT=/mnt/ram
 RAM_MTD_SIZE_HEX=`cat /proc/mtd | grep mtdram | tail -n 1 | cut -d" " -f 2`
 RAM_MTD_SIZE=`dc 0x$RAM_MTD_SIZE_HEX 1024 / p`
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index f979a50c27..23530b6dc8 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r92"
+PR = "r93"
 
 SRC_URI = "file://halt \
            file://ramdisk \