Changeset 524 in MondoRescue

Timestamp:

May 5, 2006, 11:47:41 AM (18 years ago)

Author:

bcornec

Message:

merge -r 516:523 $SVN_M/branches/stable

Location:

trunk

Files:

• mindi/mindi (modified) (3 diffs)
• mondo/mondo/mondoarchive/mondo-cli.c (modified) (2 diffs)
• mondo/mondo/mondorestore/mondo-rstr-compare.c (modified) (10 diffs)

trunk/mindi/mindi

@@ -1390 +1390 @@
     [ "$c_p" = "none" ] && continue
     absolute_partition=`ResolveSoftlink $c_p`
-    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
+    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
 
     # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
     # current_partition contains only first column of /etc/fstab
-    redhat_label=""
     if [ "`echo "$current_partition" | /bin/grep -f -i "LABEL="`" != "" ] ; then
         str_to_find_fmt_with=$current_partition
@@ -1402 +1401 @@
         # 1st try : blkid, the good way
         if [ -x "/sbin/blkid" ] ; then
-            actual_dev=`/sbin/blkid | grep "$current_partition" | /bin/cut -d':' -f1`
-        fi
+            actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1`
+        fi
+
         # 2nd try, which works on a standard partition (ext2/3), but not on swap
-        if [ $actual_dev="" ] ; then
+        if [ -n $actual_dev ] ; then
             actual_dev=`/bin/mount -l | /bin/grep " [$redhat_label]" | /bin/cut -d' ' -f1`
         fi
+
         # 3rd try, with vol_id (which works with swap)
-        if [ $actual_dev="" -a -x "/sbin/vol_id" ] ; then
+        if [ -n $actual_dev -a -x "/sbin/vol_id" ] ; then
                 list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
                 for dev_swap in $list_swaps ; do
-                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep -f "$redhat_label"`
+                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep "$redhat_label"`
                     if [ -n "$dev_exists" ] ; then
                         actual_dev=$dev_swap
@@ -1419 +1420 @@
                 done
         fi
+
         # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
-        if [ $actual_dev="" -a  "`echo "$current_partition" | /bin/grep -f -i "LABEL=SWAP"`" != ""] ; then
-                actual_dev="/dev/`echo "$redhat_label" | /bin/cut -d '-' -f2`"
-        fi
+        if [ -n $actual_dev -a  "`echo "$current_partition" | /bin/grep -i "LABEL=SWAP"`" != ""] ; then
+                try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
+                present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
+                if [ -n "$present_dev" ] ; then
+                    actual_dev="/dev/$try_dev"
+                fi
+        fi
+
         # Check if one of all those tries has known success
-        if [  $actual_dev != "" ] ; then
+        if [ ! -n $actual_dev ] ; then
                 current_partition=$actual_dev
         else
-            Die "Your system uses a labelled swap partition, but you lack the tool to su
-pport it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
+            Die "Your system uses a labelled swap partition, but you lack the tool to support it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
         fi
     else

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

@@ -327 +327 @@
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
                 flag_val['I'],
-                MAX_STR_LEN - strlen(bkpinfo->include_paths));
+                4*MAX_STR_LEN - strlen(bkpinfo->include_paths));
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
         if (bkpinfo->include_paths[0] == '-') {
@@ -561 +561 @@
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
                 flag_val['E'],
-                MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
+                4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
     }
     if (flag_set['e']) {

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -254 +254 @@
     }
     mvaddstr_and_log_it(g_currentY, 0,
-                        "Comparing large files                                                  ");
+                        _("Comparing large files                                                  "));
     open_progress_form(_("Comparing large files"),
                        _("I am now comparing the large files"),
@@ -270 +270 @@
     return (0);
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     return (retval);
@@ -430 +430 @@
 
     assert(bkpinfo != NULL);
-    mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
+    mvaddstr_and_log_it(g_currentY, 0, _("Comparing archives"));
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
 
@@ -490 +490 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(tarball_fname);
@@ -609 +609 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
     g_current_media_number = 1;
-    mvaddstr_and_log_it(1, 30, "Comparing Automatically");
+    mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
     iamhere("Pre-MAD");
     retval = mount_all_devices(mountlist, FALSE);
@@ -628 +628 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Warning - differences found during the compare phase");
+                            _("Warning - differences found during the compare phase"));
     }
 
@@ -635 +635 @@
     if (count_lines_in_file("/tmp/changed.txt") > 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Differences found while files were being compared.");
+                            _("Differences found while files were being compared."));
         streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
         if (count_lines_in_file("/tmp/changed.files") <= 0) {
             mvaddstr_and_log_it(g_currentY++, 0,
-                                "...but they were logfiles and temporary files. Your archives are fine.");
+                                _("...but they were logfiles and temporary files. Your archives are fine."));
             log_to_screen
                 (_("The differences were logfiles and temporary files. Your archives are fine."));
@@ -696 +696 @@
     run_program_and_log_output(command, FALSE);
     mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+                        0, _("Verifying archives against filesystem"));
 
     if (bkpinfo->disaster_recovery
@@ -719 +719 @@
     }
 
-    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     paranoid_free(dir);
     paranoid_free(command);
@@ -756 +756 @@
     run_program_and_log_output(command, FALSE);
     mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+                        0, _("Verifying archives against filesystem"));
     res = verify_tape_backups(bkpinfo);
     chdir(dir);
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(dir);