Changeset 149 in MondoRescue for trunk/mindi


Ignore:
Timestamp:
Dec 3, 2005, 11:38:14 PM (18 years ago)
Author:
bcornec
Message:

merge -r144:148 $SVN_M/branches/2.05

Location:
trunk/mindi
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/mindi/README.pxe

    r96 r149  
    2020(You need to have backup your data using the NFS option of mondoarchive)
    2121
    22 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.
    23 Without prefix keyword, images name mondorescue-1.iso, ... will be used.
     22If 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.
     23Without 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.
    2424
    2525During boot mondorestore will start your NFS configuration and mount mondo's content from the network rather than from a physical media.

  • trunk/mindi/mindi

    r140 r149  
    5555IDE_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"
    5656PCMCIA_MODS="pcmcia_core ds yenta_socket"
    57 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd"
     57USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
    5858CDROM_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"
    5959NET_MODS="sunrpc nfs nfsacl lockd loop e100 bcm5700 e1000 eepro100 tg3"
    … …  
    12141214    [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
    12151215   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
     1216   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
     1217   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
    12161218   AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
    12171219   AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-PATH   nfs-server-path   $outfile
    … …  
    12201222   AddFileToCfgIfExists $MONDO_TMP/ISO-DEV           iso-dev           $outfile
    12211223   AddFileToCfgIfExists $MONDO_TMP/ISO-MNT           iso-mnt           $outfile
     1224   AddFileToCfgIfExists $MONDO_TMP/ISO-PREFIX        iso-prefix        $outfile
    12221225   AddFileToCfgIfExists $MONDO_TMP/ISODIR            isodir            $outfile
    12231226   AddFileToCfgIfExists $MONDO_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
    … …  
    20012004    rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
    20022005    if [ "$retval" -eq "0" ] ; then
    2003     echo -en "...$DONE\r"
    2004     if [ "$KERN_DISK_MADE" ] && [ "$disksize" != "2880" ] ; then
    2005         LogIt "... 1440KB boot+root disks were created OK\r"
    2006     else
    2007         LogIt "... "$disksize"KB boot disk was created OK\r"
    2008     fi
    2009     else
    2010     echo -en "...failed\r"
    2011     LogIt $disksize"KB boot disk was NOT created\r"
    2012     rm -f $imagefile
     2006        echo -en "...$DONE\r"
     2007        if [ "$KERN_DISK_MADE" ] ; then
     2008            LogIt "... $disksize KB boot disks were created OK\r"
     2009        fi
     2010    else
     2011        echo -en "...failed\r"
     2012        LogIt $disksize"KB boot disk was NOT created\r"
     2013        rm -f $imagefile
    20132014    fi
    20142015    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"
    2015 #0421#$imagesdir/mindi-boot.1440.img
    20162016    return $retval
    20172017}
    … …  
    21192119        if [ "$KERN_DISK_MADE" ] ; then
    21202120            rm -f $imagefile
    2121             LogIt "... 1440KB boot+root disks were created OK\r"
    2122         else
    2123             LogIt "... "$disksize"KB boot disk was created OK\r"
    2124         fi
    2125     else
    2126     echo -en "...failed\r"
    2127     LogIt $disksize"KB boot disk was NOT created\r"
    2128     rm -f $imagefile
     2121            LogIt "... $disksize KB boot disks were created OK\r"
     2122        fi
     2123    else
     2124        echo -en "...failed\r"
     2125        LogIt $disksize"KB boot disk was NOT created\r"
     2126        rm -f $imagefile
    21292127    fi
    21302128    [ "$retval" -ne "0" ] && LogIt "PrepareBootDiskImage() is returning nonzero\n"

  • trunk/mindi/rootfs/sbin/init

    r113 r149  
    622622#    HandleCDROMorFloppies
    623623#el
    624 if [ "`cat /tmp/mondo-restore.cfg | grep "tape "`" ] || [ "`cat /tmp/mondo-restore.cfg | grep udev`" ] ; then
     624if [ "`| grep -i 'tape ' /tmp/mondo-restore.cfg`" ] || [ "`grep -i udev /tmp/mondo-restore.cfg`" ] ; then
    625625    HandleTape
    626626else
    627     if [ "`cat /proc/cmdline | grep -i pxe`" ] ; then
     627    if [ "`cat /proc/cmdline | grep -i pxe`" ] || [ "`grep -i iso-prefix /tmp/mondo-restore.cfg`" ] ; then
    628628        LogIt "PXE boot found"
    629         imgname="mondorescue"
     629        imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
     630        if [ "$imgname" = "" ]; then
     631            imgname="mondorescue"
     632        fi
    630633        if [ "`cat /proc/cmdline | grep -i prefix`" ] ; then
    631             for i in "`cat /proc/cmdline`" ; do
     634            for i in `cat /proc/cmdline` ; do
    632635                if [ "`echo $i | grep -i prefix`" ] ; then
    633636                    imgname=`echo $i | cut -d'=' -f2`
Note: See TracChangeset for help on using the changeset viewer.