Changeset 2291 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Jul 22, 2009, 2:11:26 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a printing error in mindi for the tar command
• Fix all mr_asprintf which had no second param as a string

(report bug fix done originaly in 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-prep.c (modified) (3 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -615 +615 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  mr_asprintf(&program,
-       "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d",
-       raidlist->el[i].raid_device, level,
-       raidlist->el[i].data_disks.entries);
+  mr_asprintf(&program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
   if (raidlist->el[i].parity != -1) {
     mr_asprintf(&strtmp, "%s", program);
@@ -709 +706 @@
 #endif
     if (strlen(format) <= 2) {
-        mr_asprintf(&tmp,
-                "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it",
-                device, format);
+        mr_asprintf(&tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
         log_it(tmp);
         paranoid_free(tmp);
@@ -774 +769 @@
 
                 while (1) {
-                    mr_asprintf(&tmp,
-                            "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'",
-                            line);
+                    mr_asprintf(&tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
                     FILE *pin = popen(tmp, "r");
                     paranoid_free(tmp);