[readonly/geninitrd/bootsplash: 168/176] - make rootdev local variable inside find_modules_ide (should fix problems with raid support)
draenog
draenog at pld-linux.org
Sat Nov 2 19:24:22 CET 2013
commit 28eec2b172c6415cd42e9e432124909480ccc8f0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Sep 18 22:54:24 2003 +0000
- make rootdev local variable inside find_modules_ide (should fix problems with raid support)
svn-id: @1354
geninitrd | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/geninitrd b/geninitrd
index 7aa0145..71166af 100755
--- a/geninitrd
+++ b/geninitrd
@@ -6,7 +6,7 @@
#
# based on mkinitrd from RedHat
-RCSID='$Id: geninitrd,v 2.58 2003/08/24 22:20:34 arekm Exp $'
+RCSID='$Id$'
PATH=/sbin:$PATH
export PATH
@@ -315,6 +315,7 @@ find_root() {
find_modules_softraid() {
if is_yes "$USEMDADMSTATIC" || [ -f /etc/mdadm.conf ] ; then
+ [ -n "$verbose" ] && echo "Finding RAID details using mdadm for rootdev=$1"
eval `/sbin/mdadm --examine --scan --config=/etc/mdadm.conf | \
awk -v rootdev="$1" '
BEGIN {
@@ -347,6 +348,7 @@ find_modules_softraid() {
}'`
fi
if [ "$raidfound" != "yes" ]; then
+ [ -n "$verbose" ] && echo "Finding RAID details using raidtab for rootdev=$1"
eval `awk -v rootdev="$1" 'BEGIN {
found="no";
dev_list="";
@@ -424,6 +426,8 @@ find_modules_scsi() {
}
find_modules_ide() {
+ typeset rootdev
+
rootdev="$(echo "$1" | awk ' { gsub(/\/dev\//,NUL); gsub(/[0-9].*/, NUL); print $0 } ')"
if [ "$pack_version_long" -lt "002004021" ]; then
[ -n "$verbose" ] && echo "Finding IDE modules for kernels <= 2.4.20"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/e78d0464d014f4052036c0d83d354a7bb744825d
More information about the pld-cvs-commit
mailing list