Changeset 3318 in MondoRescue for branches/3.2/mondo/src/common

Timestamp:

Dec 1, 2014, 11:35:37 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Redirect the stderr of parted2fdisk into /dev/null to avoid error msgs on LVM, even if some are redirected in mondo log files and won't disappear

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-devices.c (modified) (2 diffs)
• libmondo-tools.c (modified) (2 diffs)

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

@@ -2666 +2666 @@
         mr_free(tmp);
 // NTFS 
-        strcpy(tmp1, call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
+        strcpy(tmp1, call_program_and_get_last_line_of_output("parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
         if (strlen(tmp1) > 2) {
             if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1, MAX_STR_LEN / 4)) {
@@ -3274 +3274 @@
     malloc_string(fdisk);
     sprintf(fdisk, "/sbin/parted2fdisk");
-    sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
+    sprintf(command, "%s -l %s 2>/dev/null | grep 'EFI GPT'", fdisk, drive);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     if (strstr(tmp, "GPT") == NULL) {

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

@@ -363 +363 @@
     assert(bkpinfo != NULL);
 
-    bkpinfo->optimal_set_size = (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) * 1024;
+    bkpinfo->optimal_set_size = (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) * 1024L;
 
     log_msg(1, "Post-param");
@@ -803 +803 @@
     }
     strcpy(bkpinfo->prefix, STD_PREFIX);
-    bkpinfo->optimal_set_size = 0;
+    bkpinfo->optimal_set_size = 0L;
     bkpinfo->backup_media_type = none;
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive