Changeset 292 in MondoRescue for trunk

Timestamp:

Jan 10, 2006, 9:51:24 AM (18 years ago)

Author:

bcornec

Message:

svn merge -r288:291 $SVN_M/branches/2.06

Location:

trunk

Files:

• mindi/mindi (modified) (9 diffs)
• mondo/mondo/mondoarchive/mondo-cli.c (modified) (3 diffs)

trunk/mindi/mindi

@@ -1541 +1541 @@
     [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
     i=`find $imagesdir -type f | fgrep "/mindi-root.1" 2> /dev/null`
-    j=`find $imagesdir -type f | fgrep "/mindi-boot" | fgrep -v 2880`
+    j=`find $imagesdir -type f | fgrep "/mindi-boot" | egrep -v '2880|5760'`
 #    echo "i=$i"
 #    echo "j=$j"
@@ -1755 +1755 @@
     options=""
         if [ "$ARCH" != "ia64" ] ; then
-        echo -en "boot=/dev/loop0\ndisk=/dev/loop0\n"
+            echo -en "boot=/dev/loop0\ndisk=/dev/loop0\n"
         fi
         if [ "$disksize" -eq "2880" ] ; then
-        echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
+            echo -en "bios=0x00\nsectors=36\nheads=2\ncylinders=80\n"
         elif [ "$disksize" -eq "1722" ] ; then
-        echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
+            echo -en "bios=0x00\nsectors=21\nheads=2\ncylinders=82\n"
         elif [ "$disksize" -gt "2880" ] ; then
             /bin/true
         else
-        echo -en "bios=0x00\nsectors=18\nheads=2\ncylinders=80\n"
+            echo -en "bios=0x00\nsectors=18\nheads=2\ncylinders=80\n"
         fi
         if [ "$ARCH" != "ia64" ] ; then
@@ -1772 +1772 @@
         echo -en "default=RESTORE\n"
     elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
-    if [ -e "$MONDO_TMP/start-nfs" ] ; then
-        echo -en "default=iso\n"
-    else
-        echo -en "default=interactive\n"
-    fi
-    else
-    echo -en "default=expert\n"
-    fi
-        echo -en "prompt\n"
+        if [ -e "$MONDO_TMP/start-nfs" ] ; then
+            echo -en "default=iso\n"
+        else
+            echo -en "default=interactive\n"
+        fi
+    else
+        echo -en "default=expert\n"
+    fi
+
+    echo -en "prompt\n"
     if [ "$ARCH" != "ia64" ] ; then
         echo -en "vga=normal\nbackup=/dev/null\nmessage=/message\n"
@@ -1802 +1803 @@
     fi
     else
-    options="expert"
+        options="expert"
     fi
     for i in $options ; do
     ooo=$i
     [ "$ooo" = "RESTORE" ] && ooo="nuke"
-        if [ "$ARCH" = "ia64" ] ; then
+    if [ "$ARCH" = "ia64" ] ; then
         rootpart="root=/dev/ram0\n\t"
     else
@@ -2017 +2018 @@
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
     if [ -e "$MONDO_TMP/start-nfs" ] ; then
-    mv syslinux.cfg syslinux.cfg.orig
-    sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
+        mv syslinux.cfg syslinux.cfg.orig
+        sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
     fi
     cd $old_pwd
@@ -2024 +2025 @@
     cp -f $TMP_ROOT/mindi.rdz $mountpoint/initrd.img 2>> $LOGFILE
     if [ "$?" -ne "0" ] ; then
-    LogIt "Failed to copy $TMP_ROOT/mindi.rdz to $mountpoint\n"
-    cat $TMP_ROOT/mtpt.$$ >> $LOGFILE
-    LogIt "Please unload some of your modules and try again.\n"
-    rm -f $TMP_ROOT/mtpt.$$
-    LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
+        LogIt "Failed to copy $TMP_ROOT/mindi.rdz to $mountpoint\n"
+        cat $TMP_ROOT/mtpt.$$ >> $LOGFILE
+        LogIt "Please unload some of your modules and try again.\n"
+        rm -f $TMP_ROOT/mtpt.$$
+        LogIt "Cannot incorporate mindi.rdz in bootdisk (kernel / modules too big?)\n"
         retval=$(($retval+1))
     fi
@@ -2041 +2042 @@
     cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
     if [ "$?" -ne "0" ] || [ "$FORCE_DUAL_FLOPPIES" = "yes" ] ; then
-    echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
-    du -sk $mountpoint/* >> $LOGFILE
-    echo "--- end of list of files ---" >> $LOGFILE
-    echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
+        echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
+        du -sk $mountpoint/* >> $LOGFILE
+        echo "--- end of list of files ---" >> $LOGFILE
+        echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n\
 Sorry, your kernel is too big for a boot/root floppy.\nI'll try the new boot/root two-disk thingy.\n" >> $LOGFILE
         rm -f $mountpoint/vmlinuz
-    cd $old_pwd
+        cd $old_pwd
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
         rmdir $mountpoint || LogIt "Cannot rmdir (PBDI)\n"
@@ -2748 +2749 @@
     floppy_modules=""
     if [ "$disksize" -lt "2880" ] ; then
-    list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
-    else
-    list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+        list_of_groovy_mods="$FLOPPY_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
+    else
+        list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     fi
     if [ -e "$MONDO_TMP/start-nfs" ] ; then
@@ -3192 +3193 @@
 else
     if ! PrepareBootDiskImage_SYSLINUX $imagesdir 1722 $kernelpath $ramdisk_size ; then
-    LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
-    LogIt "if you want to make a 1.72MB floppy disk.\n"
-    fi
-    if ! PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size ; then
-        LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
-        LogIt "Please reduce your kernel's size\n"
-        LogIt "if you want to make a 2.88MB floppy disk.\n"
-    fi
-    PrepareBootDiskImage_SYSLINUX $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+        LogIt "Warning - failed to create 1.72MB boot image. Please reduce your kernel's size\n"
+        LogIt "if you want to make a 1.72MB floppy disk.\n"
+        if ! PrepareBootDiskImage_SYSLINUX $imagesdir 2880 $kernelpath $ramdisk_size ; then
+            LogIt "Warning - failed to create 2.88MB floppy disk image.\n"
+            LogIt "Please reduce your kernel's size\n"
+            LogIt "if you want to make a 2.88MB floppy disk.\n"
+            PrepareBootDiskImage_SYSLINUX $imagesdir 5760 $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+        fi
+    fi
 fi
 

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -221 +221 @@
     long itbs;
 
+    struct stat buf;
+
     assert(bkpinfo != NULL);
     assert(flag_val != NULL);
@@ -297 +299 @@
         if (bkpinfo->include_paths[0]) {
             strcat(bkpinfo->include_paths, " ");
+        }
+        if (stat(flag_val['I'], &buf) != 0) {
+            log_msg("ERROR ! %s doesn't exist", flag_val['I']);
+            fatal_error("ERROR ! You specified a directory to include which doesn't exist");
         }
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
@@ -509 +515 @@
         if (bkpinfo->exclude_paths[0]) {
             strcat(bkpinfo->exclude_paths, " ");
+        }
+        if (stat(flag_val['E'], &buf) != 0) {
+            log_msg(1, "WARNING ! %s doesn't exist", flag_val['E']);
         }
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),