Changeset 2833 in MondoRescue

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

Files:

• 2.2.8 (deleted)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (3 diffs)
• mondo/src/common/libmondo-stream.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (4 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)
• mondo/src/restore-scripts/mondo/Makefile.am (modified) (1 diff)
• mondo/src/restore-scripts/mondo/format-and-kludge-vfat (modified) (1 diff)
• mondo/src/restore-scripts/mondo/grub-MR (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

branches/2.2.8/mondo/src/common/libmondo-archive.c

@@ -378 +378 @@
     }
 
+    /*
+    if (g_tmpfs_mountpt[0] != '\0') {
+        i = atoi(call_program_and_get_last_line_of_output
+                 ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4"));
+        if (i > 0) {
+            if (free_ramdisk_space > i) {
+                free_ramdisk_space = i;
+                log_msg(2, "min(free_ramdisk_space) is now %d",
+                        free_ramdisk_space);
+                if (free_ramdisk_space < 10) {
+                    fatal_error
+                        ("Please increase PPCFG_RAMDISK_SIZE in my-stuff.h to increase size of ramdisk ");
+                }
+            }
+        }
+    }
+    */
     paranoid_free(command);
     paranoid_free(zipparams);

branches/2.2.8/mondo/src/common/libmondo-devices.c

@@ -1068 +1068 @@
     } else {
         strcpy(good_formats, " ");
-        (void) fgets(good_formats + 1, MAX_STR_LEN - 1, pin);
+        (void) fgets(good_formats + 1, MAX_STR_LEN, pin);
         if (pclose(pin)) {
             log_OS_error("Cannot pclose good formats");

branches/2.2.8/mondo/src/common/libmondo-filelist.c

@@ -1405 +1405 @@
         // 2.6 has /sys as a proc-type thing -- must be excluded
         asprintf(&strtmp,
-             "find %s -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
+             "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o -fstype proc -prune -o -fstype sysfs -prune -o %s -type d -print > %s 2> /dev/null",
              dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else

branches/2.2.8/mondo/src/common/libmondo-fork.c

@@ -3 +3 @@
 
 - subroutines for handling forking/pthreads/etc.
+
+
+01/20/2006
+- replaced partimagehack with ntfsclone
+
+06/20/2004
+- create fifo /var/log/partimagehack-debug.log and empty it
+  to keep ramdisk from filling up
+
+04/13/2004
+- >= should be <= g_loglevel
+
+11/15/2003
+- changed a few []s to char*s
+  
+10/12
+- rewrote partimagehack handling (multiple fifos, chunks, etc.)
+
+10/11
+- partimagehack now has debug level of N (set in my-stuff.h)
+
+10/08
+- call to partimagehack when restoring will now log errors to /var/log/....log
+
+10/06
+- cleaned up logging a bit
+
+09/30
+- line 735 - missing char* cmd in sprintf()
+
+09/28
+- added run_external_binary_with_percentage_indicator()
+- rewritten eval_call_to_make_ISO()
+
+09/18
+- call mkstemp instead of mktemp
+
+09/13
+- major NTFS hackage
+
+09/12
+- paranoid_system("rm -f /tmp/ *PARTIMAGE*") before calling partimagehack
+
+09/11
+- forward-ported unbroken feed_*_partimage() subroutines
+  from early August 2003
+
+09/08
+- detect & use partimagehack if it exists
+
+09/05
+- finally finished partimagehack hack :)
+
+07/04
+- added subroutines to wrap around partimagehack
+
+04/27
+- don't echo (...res=%d...) at end of log_it()
+  unnecessarily
+- replace newtFinished() and newtInit() with
+  newtSuspend() and newtResume()
+
+04/24
+- added some assert()'s and log_OS_error()'s
+
+04/09
+- cleaned up run_program_and_log_output()
+
+04/07
+- cleaned up code a bit
+- let run_program_and_log_output() accept -1 (only log if _no error_)
+
+01/02/2003
+- in eval_call_to_make_ISO(), append output to MONDO_LOGFILE
+  instead of a temporary stderr text file
+
+12/10
+- patch by Heiko Schlittermann to handle % chars in issue.net
+
+11/18
+- if mkisofs in eval_call_to_make_ISO() returns an error then return it,
+  whether ISO was created or not
+
+10/30
+- if mkisofs in eval_call_to_make_ISO() returns an error then find out if
+  the output (ISO) file has been created; if it has then return 0 anyway
+
+08/01 - 09/30
+- run_program_and_log_output() now takes boolean operator to specify
+  whether it will log its activities in the event of _success_
+- system() now includes 2>/dev/null
+- enlarged some tmp[]'s
+- added run_program_and_log_to_screen() and run_program_and_log_output()
+
+07/24
+- created
 */
 
@@ -458 +554 @@
     FILE *fout;
     FILE *ftmp;
-    int tmpcap = 512;
 
     log_msg(5, "Opening.");
-    if (!(tmp = malloc(tmpcap))) {
-        fatal_error("Failed to malloc() tmp");
-    }
+    malloc_string(tmp);
     tmp[0] = '\0';
     bufcap = 256L * 1024L;
@@ -563 +656 @@
                 sprintf(tmp, "I am here - %lld", (long long)ftello(fin));
 //    log_msg(0, tmp);
-                fread(tmp, 1, tmpcap, fin);
+                fread(tmp, 1, 512, fin);
                 log_msg(0, "tmp = '%s'", tmp);
-                fwrite(tmp, 1, tmpcap, ftmp);
+                fwrite(tmp, 1, 512, ftmp);
                 fclose(ftmp);
                 fatal_error("Missing terminating block");

branches/2.2.8/mondo/src/common/libmondo-stream.c

@@ -1232 +1232 @@
 {
     int last;
-    char fname[MAX_TAPECAT_FNAME_LEN+1];
+    char fname[MAX_TAPECAT_FNAME_LEN];
     char *p;
 

branches/2.2.8/mondo/src/common/libmondo-tools.c

@@ -473 +473 @@
     run_program_and_log_output("cat /etc/*-release", 5);
     run_program_and_log_output("cat /etc/*issue*", 5);
+    /*
+    sprintf(g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
+    sprintf(command, "mkdir -p %s", g_tmpfs_mountpt);
+    paranoid_system(command);
+    rdsiz_MB = PPCFG_RAMDISK_SIZE + g_tape_buffer_size_MB;
+    */
 #ifdef __FreeBSD__
+    /*
+    strcpy(tmp,
+           call_program_and_get_last_line_of_output
+           ("vmstat | tail -1 | tr -s ' ' | cut -d' ' -f6"));
+    avm += atol(tmp);
+    strcpy(tmp,
+           call_program_and_get_last_line_of_output
+           ("swapinfo | grep -v Device | tr -s ' ' | cut -d' ' -f4 | tr '\n' '+' | sed 's/+$//' | bc"));
+    avm += atol(tmp);
+    sprintf(command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
+            g_tmpfs_mountpt);
+            */
 #else
+    /*
+    strcpy(tmp,
+           call_program_and_get_last_line_of_output
+           ("free | grep ':' | tr -s ' ' '\t' | cut -f2 | head -n1"));
+    avm += atol(tmp);
+    sprintf(command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
+            g_tmpfs_mountpt, rdsiz_MB, 'm');
+            */
     run_program_and_log_output("cat /proc/cpuinfo", 5);
     run_program_and_log_output
@@ -480 +506 @@
          5);
 #endif
+    /*
+    if (avm / 1024 > rdsiz_MB * 3) {
+        if (run_program_and_log_output(command, 5)) {
+            g_tmpfs_mountpt[0] = '\0';
+            log_it("Failed to mount tmpfs");
+        } else {
+            log_it("Tmpfs mounted OK - %d MB", rdsiz_MB);
+        }
+    } else {
+        g_tmpfs_mountpt[0] = '\0';
+        log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
+    }
+    */
 
     if (bkpinfo->use_lzo) {

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

branches/2.2.8/mondo/src/restore-scripts/mondo/Makefile.am

@@ -4 +4 @@
                         make-me-bootable mount-me mount-subroutine-me raw-MR \
                         stabgrub-me stablilo-me stabelilo-me \
-                        stabraw-me unmount-me unmount-subroutine-me \
+                        stabraw-me unmount-me unmount-subroutine-me
                         format-and-kludge-vfat

branches/2.2.8/mondo/src/restore-scripts/mondo/format-and-kludge-vfat

@@ -63 +63 @@
 
 device=$1
-echo $device | grep -Eq "/cciss/|/mapper/|/ida/" 
-if [ $? -eq "0" ]; then
-    drive=`echo $device | sed s/[0-9p]*[0-9]//`
-else
-    drive=`echo $drive | sed s/[0-9]*[0-9]//`
-fi
+drive=`echo $device | sed s/[0-9]*[0-9]//`
 partition=`echo $device | sed s\%$drive\%\%`
 

branches/2.2.8/mondo/src/restore-scripts/mondo/grub-MR

@@ -115 +115 @@
     partno=`basename $bootpart | cut -d'p' -f2`
 elif echo $bootpart | grep "/mapper/mpath" > /dev/null ; then
-    partno=`basename $bootpart | cut -d'p' -f3`
+    partno=`basename $bootpart | cut -d'p' -f2`
 else
     partno=`basename $bootpart | sed s/[a-z]*//`
@@ -128 +128 @@
     line=`grep $base /proc/mdstat | head -n1`
     echo "mbrpart was $mbrpart"
-    mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
+    mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' \
+| cut -d' ' -f2`
     echo "mbrpart is $mbrpart"
     partno="0"; # cheating - FIXME    

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

@@ -61 +61 @@
 noof_blank_lines=0
 read line
-# We end after 50 empty lines, which hopefully means we reach the end of the file
-while [ "$noof_blank_lines" -le "50" ] ; do
+while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do
     if [ "$line" = "" ] ; then
         noof_blank_lines=$(($noof_blank_lines+1))