Changeset 2833 in MondoRescue for branches/2.2.8/mondo/src/mondorestore

Timestamp:

Jun 19, 2011, 2:13:48 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Revert bad changes made accidentaly on the 2.2.8 branch

Location:

branches/2.2.8/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (4 diffs)
• mondo-rstr-tools.c (modified) (2 diffs)
• mondorestore.c (modified) (1 diff)

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

@@ -288 +288 @@
     log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
     rewind(fin);
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (fgets(incoming, 512, fin); !feof(fin); fgets(incoming, 512, fin)) {
         fgetpos(fin, &orig_pos);
         if (incoming[0] != '#') {
@@ -301 +301 @@
         if ((p = strstr(incoming, "vgcreate"))) {
 // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
-            for (fgets(tmp, MAX_STR_LEN - 1, fin); !feof(fin); fgets(tmp, MAX_STR_LEN - 1, fin)) {
+            for (fgets(tmp, 512, fin); !feof(fin); fgets(tmp, 512, fin)) {
                 if (tmp[0] == '#') {
                     fsetpos(fin, &orig_pos);
@@ -1784 +1784 @@
             MONDO_LOGFILE);
 
-    /* BERLIOS: should not be called each time */
+    /* BERLIOS: shoould not be called each time */
     part_table_fmt = which_partition_format(drive);
     output[0] = '\0';
@@ -2406 +2406 @@
     } else if (strcmp(format, "vmfs") == 0) {
         strcpy(program, "mkfs -t vmfs");
-    } else if (strcmp(format, "ntfs") == 0) { 
-        /* 
-         * mkfs.ntfs treats the '-c' switch as 'specify cluster size' 
-         * so the default "mkfs -t %s -c" command structure fails 
-         */ 
-        strcpy(program, "mkfs -t ntfs");
     } else if (strcmp(format, "ocfs2") == 0) {
         /*

branches/2.2.8/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -721 +721 @@
 run_program_and_log_output("mkdir -p " MNT_RESTORING
                        "/var/run/console", FALSE);
+/* To support latest Ubuntu where /var is a separate FS Cf: http://linux.derkeiler.com/Mailing-Lists/Ubuntu/2007-04/msg01319.html */
+run_program_and_log_output("mkdir -p " MNT_RESTORING
+                       "/var/lock /var/run", FALSE);
 run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null",
                        FALSE);
@@ -2086 +2089 @@
                     sprintf(command, "umount " MNT_RESTORING "%s",
                             mountlist->el[lino].mountpoint);
-
-                    /* To support latest Ubuntu where /var is a separate FS 
-                     * Cf: http://linux.derkeiler.com/Mailing-Lists/Ubuntu/2007-04/msg01319.html 
-                     * we need to create some dirs under the real / before unmounting it */
-                    if (!strcmp(mountlist->el[lino].mountpoint, "/")) {
-                        run_program_and_log_output("mkdir -p " MNT_RESTORING "/var/lock", FALSE);
-                        run_program_and_log_output("mkdir -p " MNT_RESTORING "/var/run", FALSE);
-                    }
                 }
             }

branches/2.2.8/mondo/src/mondorestore/mondorestore.c

@@ -655 +655 @@
     protect_against_braindead_sysadmins();
     retval += unmount_all_devices(mountlist);
-
     /*  if (restore_some || restore_all || */
     if (ask_me_yes_or_no