Changeset 1297 in MondoRescue

Timestamp:

Apr 12, 2007, 1:56:35 AM (18 years ago)

Author:

Bruno Cornec

Message:

• evaluate_drive_within_mountlist is a private function
• support UUID in mondorestore (Fix for #103)
• Fix a bug in size computation for cciss and similar devices needing a p before their partition name
• Fix 2 references to grep -x which are not working during a restore process due to busybox limits of grep command (Fix for #96)

Location:

branches/stable/mondo

Files:

• ChangeLog (modified) (1 diff)
• src/common/libmondo-mountlist-EXT.h (modified) (1 diff)
• src/common/libmondo-mountlist.c (modified) (6 diffs)
• src/common/libmondo-mountlist.h (modified) (1 diff)
• src/common/mondostructures.h (modified) (2 diffs)
• src/mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• src/mondorestore/mondorestore.c (modified) (2 diffs)
• src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

branches/stable/mondo/ChangeLog

@@ -3 +3 @@
 MONDO CHANGES
 2.2.2 (2007-04-08)
+- support UUID in mondorestore (Fix #103) (Bruno Cornec)
+- Fix a bug in size computation for cciss and similar devices needing a p before their partition name (Bruno Cornec)
+- Fix 2 references to grep -x (Fix for #96) (Bruno Cornec)
 - Add build support for Mandriva 2007.1, RREL 5 and Debian 4.0 (Bruno Cornec)
 - Handle no compression + verify correctly (Scott Cummings)

branches/stable/mondo/src/common/libmondo-mountlist-EXT.h

@@ -1 +1 @@
 /* libmondo-mountlist-EXT.h */
 
-extern int evaluate_drive_within_mountlist(struct mountlist_itself
-                                           *mountlist, char *drive,
-                                           char *flaws_str);
 extern int evaluate_mountlist(struct mountlist_itself *mountlist,
                               char *flaws_str_A, char *flaws_str_B,

branches/stable/mondo/src/common/libmondo-mountlist.c

@@ -411 +411 @@
 
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        mr_asprintf(&device, "%s%d", drive, curr_part_no);
+        if ((strstr(device, "/cciss/") != NULL) ||
+            (strstr(device, "/ataraid/") != NULL) ||
+            (strstr(device, "/ida/") != NULL) ||
+            (strstr(device, "/rd/") != NULL)) {
+                mr_asprintf(&device, "%sp%d", drive, curr_part_no);
+                sprintf(device, "%sp%d", drive, curr_part_no);
+            } else {    
+                mr_asprintf(&device, "%s%d", drive, curr_part_no);
+            }
         pos = find_device_in_mountlist(mountlist, device);
         if (pos < 0) {
@@ -418 +426 @@
         if (physical_drive_size < 0) {
             mr_asprintf(&tmp, " %s refers to non-existent hardware.", device);
+            log_it(tmp);
             strcat(flaws_str, tmp);
             res++;
@@ -848 +857 @@
 #if linux
         sscanf(incoming,
-               "%s %s %s %s %s",
+               "%s %s %s %s %s %s",
                mountlist->el[items].device,
                mountlist->el[items].mountpoint,
                mountlist->el[items].format,
-               siz, mountlist->el[items].label);
+               siz, mountlist->el[items].label, mountlist->el[items].uuid);
 #elif __FreeBSD__
         sscanf(incoming,
@@ -860 +869 @@
                mountlist->el[items].format, siz);
         strcpy(mountlist->el[items].label, "");
+        strcpy(mountlist->el[items].uuid, "");
 #endif
 
@@ -914 +924 @@
                      mountlist->el[items].format,
                      mountlist->el[items].size,
-                     mountlist->el[items].label);
+                    mountlist->el[items].label,
+                    mountlist->el[items].uuid);
             items++;
         }
@@ -956 +967 @@
                 mountlist->el[i].device, mountlist->el[i].mountpoint,
                 mountlist->el[i].format, mountlist->el[i].size,
-                mountlist->el[i].label);
+                mountlist->el[i].label, mountlist->el[i].uuid);
     }
     paranoid_fclose(fout);

branches/stable/mondo/src/common/libmondo-mountlist.h

@@ -4 +4 @@
 
 
-int evaluate_drive_within_mountlist(struct mountlist_itself *mountlist,
-                                    char *drive, char *flaws_str);
 int evaluate_mountlist(struct mountlist_itself *mountlist,
                        char *flaws_str_A, char *flaws_str_B,

branches/stable/mondo/src/common/mondostructures.h

@@ -45 +45 @@
    */
     char label[256];
+
+    /**
+     * This is the filesystem UUID (if there is one). If not, this should be "".
+     */
+    char uuid[64];
 };
 
@@ -785 +790 @@
 };
 
-
 /**
  * A tape catalog, made of a list of @p s_tapecat_entry.
  */
 struct s_tapecatalog {
-        /**
-     * The number of entries in the tape catalog.
-     */
-    int entries;
-
-        /**
-     * The entries themselves, all @p entries of them.
-     */
-    struct s_tapecat_entry el[MAX_TAPECATALOG_ENTRIES];
-};
+               /**
+        * The number of entries in the tape catalog.
+        */
+       int entries;
+
+               /**
+        * The entries themselves, all @p entries of them.
+        */
+       struct s_tapecat_entry el[MAX_TAPECATALOG_ENTRIES];
+};

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -105 +105 @@
                    struct raidlist_itself *);
 void edit_raidrec_additional_vars(struct raid_device_record *);
-int evaluate_drive_within_mountlist(struct mountlist_itself *, char *,
-                                    char *);
 int evaluate_mountlist(struct mountlist_itself *, char *, char *, char *);
 int find_device_in_mountlist(struct mountlist_itself *, char *);

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -585 +585 @@
     /*  if (restore_some || restore_all || */
     if (ask_me_yes_or_no
-        (_("Label your ext2 and ext3 partitions if necessary?"))) {
+        (_("Label/Identify your ext2 and ext3 partitions if necessary?"))) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            _("Using e2label to label your ext2,3 partitions"));
+                            _("Using tune2fs to identify your ext2,3 partitions"));
         if (does_file_exist("/tmp/fstab.new")) {
             mr_asprintf(&fstab_fname, "/tmp/fstab.new");
@@ -838 +838 @@
     mvaddstr_and_log_it(g_currentY,
                         0,
-                        _("Using e2label to label your ext2,3 partitions"));
+                        _("Using tune2fs to identify your ext2,3 partitions"));
 
     mr_asprintf(&tmp, "label-partitions-as-necessary %s < /tmp/fstab",

branches/stable/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -7 +7 @@
 
 read_partition_line() {
-    local tmp label mountpt mountline command format
-    if [ "`echo "$1" | grep "LABEL="`" != "" ] ; then
+    local tmp label mountpt command format
+
+    if [ "`echo "$1" | grep -E 'LABEL='`" != "" ] ; then
+        opttun="-L"
+    elif [ "`echo "$1" | grep -E 'UUID='`" != "" ] ; then
+        opttun="-U"
+    else
+        # Nothing to do
+        return
+    fi
+
     tmp=`echo "$1" | tr -s ' ' '\t' | cut -f1`
     label=`echo "$tmp" | cut -d'=' -f2`
     format=`echo "$1" | tr -s ' ' '\t' | cut -f3`
-    mountline=`mount | grep " $label "`
-#   mountpt=`echo "$mountline" | cut -d' ' -f1`
-!   mountpt=`grep " $label " $mountlist | cut -d' ' -f1`
-        if [ ! "$mountpt" ] ; then
-            LogIt "Not labeling anything as $label because $mountpt is not a mountpoint"
-        elif [ ! "$label" ] ; then
-            LogIt "Not labeling $mountpt as anything because $label is not a label"
-        else
-            if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
-                command="e2label $mountpt $label"
-                LogIt "Running $command"
-                $command
-            elif [ "$format" = "swap" ] ; then
-                command="mkswap -L $label $mountpt"
-                LogIt "Running $command"
-            else
-                LogIt "I am NOT going to run e2label: the partition is format '$format', which doesn't like e2label anyway"
-            fi
+    mountpt=`grep -w " $label" $mountlist | cut -d' ' -f1`
+    if [ ! "$mountpt" ] ; then
+        LogIt "Not labeling anything as $label because $mountpt is not a mountpoint"
+    elif [ ! "$label" ] ; then
+        LogIt "Not labeling $mountpt as anything because $label is not a label"
+    else
+        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
+            command="tune2fs $opttun $label $mountpt"
+            LogIt "Running $command"
+            $command
+        elif [ "$format" = "swap" ] ; then
+            if [ "$opttun" = "-U" ]; then
+                echo "Unable yet to identify swap with UUID"
+            else
+                command="mkswap $opttun $label $mountpt"
+                LogIt "Running $command"
+                $command
+            fi
+        else
+            LogIt "I am NOT going to run tune2fs: the partition is format '$format', which doesn't like tune2fs anyway"
+        fi
     fi
-    fi
 }
-
 
 
 # ---------------------------------------------
 
-LogIt "Labeling your drives with e2label"
+LogIt "Identifying your drives with tune2fs"
 if [ "$#" -ne "1" ] ; then
     LogIt "label-partitions-as-necessary /tmp/mountlist.txt < /tmp/fstab.new" 1