Changeset 149 in MondoRescue for trunk/mindi/mindi

Timestamp:

Dec 3, 2005, 11:38:14 PM (18 years ago)

Author:

bcornec

Message:

merge -r144:148 $SVN_M/branches/2.05

File:

• trunk/mindi/mindi (modified) (5 diffs)

trunk/mindi/mindi

@@ -55 +55 @@
 IDE_MODS="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core libata edd paride ata_piix libata"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
-USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd"
+USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
 CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
 NET_MODS="sunrpc nfs nfsacl lockd loop e100 bcm5700 e1000 eepro100 tg3"
@@ -1214 +1214 @@
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
    AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
+   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
+   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
    AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
    AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-PATH   nfs-server-path   $outfile
@@ -1220 +1222 @@
    AddFileToCfgIfExists $MONDO_TMP/ISO-DEV           iso-dev           $outfile
    AddFileToCfgIfExists $MONDO_TMP/ISO-MNT           iso-mnt           $outfile
+   AddFileToCfgIfExists $MONDO_TMP/ISO-PREFIX        iso-prefix        $outfile
    AddFileToCfgIfExists $MONDO_TMP/ISODIR            isodir            $outfile
    AddFileToCfgIfExists $MONDO_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
@@ -2001 +2004 @@
     rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
     if [ "$retval" -eq "0" ] ; then
-    echo -en "...$DONE\r"
-    if [ "$KERN_DISK_MADE" ] && [ "$disksize" != "2880" ] ; then
-        LogIt "... 1440KB boot+root disks were created OK\r"
-    else
-        LogIt "... "$disksize"KB boot disk was created OK\r"
-    fi
-    else
-    echo -en "...failed\r"
-    LogIt $disksize"KB boot disk was NOT created\r"
-    rm -f $imagefile
+        echo -en "...$DONE\r"
+        if [ "$KERN_DISK_MADE" ] ; then
+            LogIt "... $disksize KB boot disks were created OK\r"
+        fi
+    else
+        echo -en "...failed\r"
+        LogIt $disksize"KB boot disk was NOT created\r"
+        rm -f $imagefile
     fi
     [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"
-#0421#$imagesdir/mindi-boot.1440.img
     return $retval
 }
@@ -2119 +2119 @@
         if [ "$KERN_DISK_MADE" ] ; then
             rm -f $imagefile
-            LogIt "... 1440KB boot+root disks were created OK\r"
-        else
-            LogIt "... "$disksize"KB boot disk was created OK\r"
-        fi
-    else
-    echo -en "...failed\r"
-    LogIt $disksize"KB boot disk was NOT created\r"
-    rm -f $imagefile
+            LogIt "... $disksize KB boot disks were created OK\r"
+        fi
+    else
+        echo -en "...failed\r"
+        LogIt $disksize"KB boot disk was NOT created\r"
+        rm -f $imagefile
     fi
     [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"