Changeset 572 in MondoRescue for branches/stable/mindi

Timestamp:

May 24, 2006, 12:20:19 AM (19 years ago)

Author:

bcornec

Message:

gentoo build continued
mindi bug found due to a previous bug corrected (5.6 MB disks generated systematically):

• when a disk less than 2.8 MB can be built, not enough modules are put on it to support SCSI cds (use of FLOPPY_MODS only). I added most CDROMs modules in order to support them.

Location:

branches/stable/mindi

Files:

• distributions/gentoo/mindi.ebuild (modified) (1 diff)
• mindi (modified) (7 diffs)

branches/stable/mindi/distributions/gentoo/mindi.ebuild

@@ -1 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
 # $Id$
-# $Header$
 
 DESCRIPTION="A program that creates emergency boot disks/CDs using your kernel, tools and modules."

branches/stable/mindi/mindi

@@ -702 +702 @@
     pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-    cd $TMP_ROOT
-    else
-    cd /
+        cd $TMP_ROOT
+    else
+        cd /
     fi
     if [ ! -e "$1" ] ; then
-    LogIt "Warning - cannot search specific path '$1'\n"
-    return 1
+        LogIt "Warning - cannot search specific path '$1'\n"
+        return 1
     fi
     modpaths=`find $1 -name $2.*o -type f`
@@ -1222 +1222 @@
     echo "echo -en \"Loading your modules...\"" >> $outfile
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-    kver=$FAILSAFE_KVER
-    cd $TMP_ROOT
-    searchpath=lib/modules/$kver
+        kver=$FAILSAFE_KVER
+        cd $TMP_ROOT
+        searchpath=lib/modules/$kver
     else
 ###
@@ -1239 +1239 @@
 ### Sq-Modification end
 ###
-    searchpath=/lib/modules/$kver
+        searchpath=/lib/modules/$kver
     fi
     
@@ -2780 +2780 @@
     old_pwd=`pwd`
     if [ "$YOUR_KERNEL_SUCKS" ] ; then
-    cd $TMP_ROOT
-    floppy_modules_path=lib/modules/$FAILSAFE_KVER
-    else
-    cd /
+        cd $TMP_ROOT
+        floppy_modules_path=lib/modules/$FAILSAFE_KVER
+    else
+        cd /
 ###
 ### Sq-Modification... Use kernel name in module path if specified.
@@ -2790 +2790 @@
         if [ "${kernelname}" != "" ]
         then
-          floppy_modules_path=lib/modules/${kernelname}
+            floppy_modules_path=lib/modules/${kernelname}
         else
-          floppy_modules_path=lib/modules/`uname -r`
+            floppy_modules_path=lib/modules/`uname -r`
         fi
 ###
@@ -2800 +2800 @@
     floppy_modules=""
     if [ "$disksize" -lt "2880" ] ; then
-        list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+        list_of_groovy_mods="$FLOPPY_MODS $IDE_MODS ide-scsi sr_mod `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     else
         list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
@@ -2815 +2815 @@
     [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"
     for i in $list_of_groovy_mods ; do
-    floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
+        floppy_modules="$floppy_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
     done
     for i in $floppy_modules ; do
         [ -e "$i" ] && s=`du -sk $i | cut -f1` || s=""
-    [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
-    echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
-    cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
-    [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
+        [ "$YOUR_KERNEL_SUCKS" ] && i=$TMP_ROOT/$i
+        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
+        cp -df $i $mountpoint/ || LogIt "Unable to copy $i to $mountpoint\n"
+        [ "`echo "$i" | fgrep ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
     done
 #    if [ -e "/dev/.devfsd" ] ; then