- hardcode VERSION (as 2.6)

- move initialize variables on top and few indentation.

svn-id: @1218

diff --git a/geninitrd b/geninitrd
index 64ae8ff8281760354aca436fac26d07a4ced1cd3..c6096c335ce201c656dc0d48eef00b8f7889cb95 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -6,11 +6,11 @@
 #
 # based on mkinitrd from RedHat
 #
-RCSID='$Id: geninitrd,v 2.6 2001/09/07 13:25:36 wiget Exp $'
+# $Id: geninitrd,v 2.7 2001/09/07 17:56:33 kloczek Exp $
 PATH=/sbin:$PATH
 export PATH
 
-VERSION="`echo "$RCSID"|awk '{print $3}'`"
+VERSION="2.6"
 
 . /etc/rc.d/init.d/functions
 
@@ -18,14 +18,8 @@ COMPRESS="yes"
 FS="rom"
 USEBSP="yes"
 USERAIDSTART="no"
-
-if [ -f /etc/sysconfig/geninitrd ] ; then
-       . /etc/sysconfig/geninitrd
-fi
-
-if is_yes $USEBSP ; then
-       [ ! -x /sbin/bsp ] && USEBSP="no"
-fi
+PRESCSIMODS="scsi_mod unknown sd_mod"
+PREIDEMODS="ide-mod ide-probe ide-probe-mod ide-disk"
 target=""
 kernel=""
 force=""
@@ -34,13 +28,6 @@ MODULES=""
 img_vers=""
 modulefile=/etc/modules.conf
 raidtab=/etc/raidtab
-if [ "`uname -m`" = "ia64" ]; then
-       IMAGESIZE=3000
-else
-       IMAGESIZE=1500
-fi
-PRESCSIMODS="scsi_mod unknown sd_mod"
-PREIDEMODS="ide-mod ide-probe ide-probe-mod ide-disk"
 fstab="/etc/fstab"
 
 usage () {
@@ -236,6 +223,18 @@ find_root() {
 
 }
 
+if [ -r /etc/sysconfig/geninitrd ] ; then
+       . /etc/sysconfig/geninitrd
+fi
+
+if is_yes $USEBSP ; then
+       [ ! -x /sbin/bsp ] && USEBSP="no"
+fi
+if [ "`uname -m`" = "ia64" ]; then
+       IMAGESIZE=3000
+else
+       IMAGESIZE=1500
+fi
 while [ $# -gt 0 ]; do
        case $1 in
        --no-bsp)
@@ -455,9 +454,9 @@ if is_yes "$ADDSCSI" || is_yes "$(echo "$rootdev" | awk '/^\/dev\/(sd|scsi)/ { p
 fi
 
 if is_yes "$ADDIDE" || is_yes "`echo "$rootdev" | awk '/^\/dev\/(hd|ide)/ { print "yes"; }'`" ; then
-    for n in $PREIDEMODS; do
-           findmodule "$n"
-    done
+       for n in $PREIDEMODS; do
+               findmodule "$n"
+       done
 fi
 
 if is_yes "`echo "$rootdev" | awk '/\/dev\/rd\// { print "yes"; }'`" ; then