Changeset 127 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

Nov 19, 2005, 2:27:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r 125:126 $SVN_M/branches/2.05

Location:

trunk/mondo/mondo/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-rstr-newt.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (2 diffs)
• mr-externs.h (modified) (1 diff)

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -488 +488 @@
             if (lvmversion == 2) {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("cat /var/log/mondo-archive.log | tail -n5 | grep Insufficient | tail -n1"));
+                       ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1"));
             } else {
                 strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("cat /var/log/mondo-archive.log | tail -n5 | grep lvcreate | tail -n1"));
+                       ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1"));
             }
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);

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

@@ -2312 +2312 @@
 #else
 
-    for (i = 0;
-         strcmp(raidlist->el[i].raid_device, device)
+    for (i = 0; strcmp(raidlist->el[i].raid_device, device)
          && i < raidlist->entries; i++);
 #endif
@@ -2625 +2624 @@
  * @ingroup restoreUtilityGroup
  */
-int
-read_variableINT_and_remove_from_raidvars(struct
-                                          OSSWAP (raid_device_record,
-                                                  vinum_volume) * raidrec,
-                                          char *label)
+int read_variableINT_and_remove_from_raidvars(struct
+                                              OSSWAP (raid_device_record,
+                                                      vinum_volume) *
+                                              raidrec, char *label)
 {
     /** int ***************************************************************/

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

@@ -745 +745 @@
 #endif
 
-    } else
-     if (bkpinfo->backup_media_type == iso) {
+    } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
         sprintf(mount_cmd, "%s/%d.iso", bkpinfo->isodir,
@@ -1965 +1964 @@
     int signals[] =
         { SIGKILL, SIGPIPE, SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT,
-SIGSTOP, 0 };
+        SIGSTOP, 0
+    };
     int i;
     for (i = 0; signals[i]; i++) {

trunk/mondo/mondo/mondorestore/mr-externs.h

@@ -85 +85 @@
 extern void resize_drive_proportionately_to_suit_new_drives(struct
                                                             mountlist_itself
-                                                            *mountlist,
-                                                            char
+                                                            *mountlist, char
                                                             *drive_name);
 extern void resize_mountlist_proportionately_to_suit_new_drives(struct