Changeset 289 in MondoRescue

Timestamp:

Jan 10, 2006, 9:35:09 AM (18 years ago)

Author:

bcornec

Message:

Abort when one of the include dirs (-I) does not exist (bug reported by jeff@…)
A warning is also logged for the -E option

Location:

branches/2.06

Files:

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

branches/2.06/mindi/mindi

@@ -2017 +2017 @@
     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 +2024 @@
     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 +2041 @@
     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"
@@ -3192 +3192 @@
 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"
+        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

branches/2.06/mondo/mondo/mondoarchive/mondo-cli.c

@@ -360 +360 @@
     long itbs;
 
+    struct stat buf;
+
     malloc_string(tmp);
     malloc_string(psz);
@@ -439 +441 @@
         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),
@@ -652 +658 @@
         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),