Changeset 148 in MondoRescue for branches/2.05/mindi

Timestamp:

Dec 2, 2005, 8:22:32 PM (19 years ago)

Author:

bcornec

Message:

• Bug on USB keyboard corrected
• PXE mode reviewed (netmask and route management added in start-nfs)
• -p option with PXE doesn't require a parameter anymore and it now works with the parameter
• -p option should work correctly with iso and nfs modes
• cosmetic messages improvement for mindi
• use STD_PREFIX

Location:

branches/2.05/mindi

Files:

• README.pxe (modified) (1 diff)
• mindi (modified) (5 diffs)
• rootfs/sbin/init (modified) (1 diff)

branches/2.05/mindi/README.pxe

@@ -20 +20 @@
 (You need to have backup your data using the NFS option of mondoarchive)
 
-If you used the -p option of mondoarchive, you'll have to specify the real name of mondo images to use during restore. To do that use prefix=machine on the initrd line, after the pxe keyword, to load the ISO images saved with -p machine.
-Without prefix keyword, images name mondorescue-1.iso, ... will be used.
+If you used the -p option of mondoarchive, you may specify the real name of mondo images to use during restore. To do that use prefix=machine on the initrd line, after the pxe keyword, to load the ISO images saved with -p machine.
+Without prefix keyword, the name of the images used during archiving with the -p option will be used (they may differ). If -p wasn't used then the name mondorescue-1.iso, ... will be used.
 
 During boot mondorestore will start your NFS configuration and mount mondo's content from the network rather than from a physical media.

branches/2.05/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"

branches/2.05/mindi/rootfs/sbin/init

@@ -622 +622 @@
 #    HandleCDROMorFloppies
 #el
-if [ "`cat /tmp/mondo-restore.cfg | grep "tape "`" ] || [ "`cat /tmp/mondo-restore.cfg | grep udev`" ] ; then
+if [ "`| grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ] ; then
     HandleTape
 else
-    if [ "`cat /proc/cmdline | grep -i pxe`" ] ; then
+    if [ "`cat /proc/cmdline | grep -i pxe`" ] || [ "`grep -i iso-prefix /tmp/mondo-restore.cfg`" ] ; then
         LogIt "PXE boot found"
-        imgname="mondorescue"
+        imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+        if [ "$imgname" = "" ]; then
+            imgname="mondorescue"
+        fi
         if [ "`cat /proc/cmdline | grep -i prefix`" ] ; then
-            for i in "`cat /proc/cmdline`" ; do
+            for i in `cat /proc/cmdline` ; do
                 if [ "`echo $i | grep -i prefix`" ] ; then
                     imgname=`echo $i | cut -d'=' -f2`