Changeset 1854 in MondoRescue

Timestamp:

Jan 11, 2008, 10:58:11 AM (17 years ago)

Author:

Bruno Cornec

Message:

removal of locate usage completely from code to use findw!

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -592 +592 @@
     done
     if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
-       mappath=$(locate */kbd/keymaps/*/$locale)
+            mappath=$(find / -name "*/kbd/keymaps/*/$locale")
     fi
     echo "mappath = $mappath" >> $LOGFILE
@@ -617 +617 @@
     [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib/syslinux/isolinux.bin
     [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib64/syslinux/isolinux.bin
-    [ ! -e "$ISOLINUX" ] && ISOLINUX=`locate isolinux.bin | grep -x "/.*/isolinux.bin"`
+    [ ! -e "$ISOLINUX" ] && ISOLINUX=`find / -name isolinux.bin | grep -x "/.*/isolinux.bin"`
     [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.com and click on 'Download'"
     echo "Found isolinux.bin at $ISOLINUX" >> $LOGFILE

branches/2.2.5/mondo/src/common/libmondo-archive.c

@@ -2005 +2005 @@
         paranoid_system(tmp3);
     }
-    /*
-       if (!does_file_exist(tmp))
-       {
-       log_msg (2, "Silly bug in Mindi.pl; workaround in progress...");
-       strcpy(fnam, call_program_and_get_last_line_of_output("locate isolinux.bin | tail -n1"));
-       if (strlen(fnam)>0 && does_file_exist(fnam))
-       {
-       sprintf(tmp, "cp -f %s %s", fnam, bkpinfo->scratchdir);
-       res = run_program_and_log_output(tmp, FALSE);
-       }
-       else
-       {
-       res = 1;
-       }
-       if (res)
-       {
-       log_msg (2, "Could not work around silly bug in Mindi.pl - sorry! Isolinux.bin missing");
-       }
-       }
-     */
     free(tmp2);
     free(tmp3);

branches/2.2.5/mondo/src/common/libmondo-filelist.c

@@ -1696 +1696 @@
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
+    char *tmp1 = NULL;
 
     malloc_string(command);
@@ -1751 +1752 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
+        asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",call_program_and_get_last_line_of_output("mount |  grep -Ew 'ntfs|fat|vfat' | awk '{print $3}' | tr '\n' ' '"));
         snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
-/proc /sys /root/images/mondo " MINDI_CACHE, MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+/proc /sys /root/images/mondo " MINDI_CACHE, MONDO_CACHE, excp, call_program_and_get_last_line_of_output(tmp1), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        paranoid_free(tmp1);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);

branches/2.2.5/mondo/src/common/libmondo-tools.c

@@ -1172 +1172 @@
         log_to_screen("I think you have a Windows 9x partition.");
         retval += whine_if_not_found("parted");
-#ifndef __IA64__
-        /* IA64 always has one vfat partition for EFI even without Windows */
-        // retval += 
-        if (!find_home_of_exe("ms-sys")) {
-            log_to_screen("Please install ms-sys just in case.");
-        }
-#endif
     }