Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-devices.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/common/libmondo-devices.c (modified) (13 diffs)

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

@@ -331 +331 @@
     char *searchstr = NULL;
     char *tmp = NULL;
+    char *p;
 
     /*@ ints ******************************************************* */
@@ -816 +817 @@
     }
 
-    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
+    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
     mr_free(cdr_exe);
 
@@ -848 +849 @@
     }
 
-    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
+    tmp = call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
         mr_free(tmp);
-        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
+        tmp = call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1",TRUE);
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
@@ -886 +887 @@
 #if linux
     unsigned long long s = 0;
-    int fileid, cylinders = 0, cylindersleft = 0;
+    int fileid, cylinders = 0;
     int cylindersize = 0;
     int gotgeo = 0;
@@ -935 +936 @@
             if (ioctl(fileid, HDIO_GETGEO, &hdgeo) != -1) {
                 if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
-                    cylindersleft = cylinders = hdgeo.cylinders;
                     cylindersize = hdgeo.heads * hdgeo.sectors / 2;
                     outvalA = cylindersize * cylinders / 1024;
@@ -983 +983 @@
     char *command = NULL;
     char *format_sz = NULL;
+    char *p;
 
     FILE *pin;
@@ -1822 +1823 @@
 
         /* Check for LVM */
-        mr_asprintf(command, "pvdisplay -c %s | grep '%s:' 2> /dev/null", partitions[i], partitions[i]);
+        mr_asprintf(command, "pvdisplay -c %s 2> /dev/null", partitions[i]);
         log_msg(5, "  Running: %s", command);
         tmp = call_program_and_get_last_line_of_output(command,TRUE);
@@ -2638 +2639 @@
     char *p = NULL;
     char *q = NULL;
+    char *tmpro = NULL;
+    char *tmp1 = NULL;
     char *mds = NULL;
     char *sz_size = NULL;
@@ -2873 +2876 @@
             bkpinfo->media_size[i] = bkpinfo->media_size[0];
         }
+        bkpinfo->use_obdr = ask_me_yes_or_no
+            ("Do you want to activate OBDR support for your tapes ?");
+        if (bkpinfo->use_obdr) {
+            log_msg(4, "obdr mode = TRUE");
+        } else {
+            log_msg(4, "obdr mode = FALSE");
+        }
         if (archiving_to_media) {
             if ((compression_type = which_compression_type()) == NULL) {
@@ -2968 +2978 @@
         if (bkpinfo->disaster_recovery) {
             mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
-            (void)system(command);
+            paranoid_system(command);
             mr_free(command);
 
         }
-        p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
+<<<<<<< .courant
+        p = popup_and_get_string("Network protocol", "Which Network protocol should I use (nfs/sshfs/smbfs) ?", bkpinfo->netfs_proto);
         if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
@@ -3016 +3027 @@
 
             if (bkpinfo->restore_data) {
+                /*  mount th FS read-only in restore mode to avoid any erase of whatever */
+                mr_asprintf(tmpro, "-o ro");
+            } else {
+                mr_asprintf(tmpro, "");
+            }
+
+            /*  Build the mount string */
+            if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                mr_asprintf(tmp, "mount -t cifs %s %s %s",bkpinfo->netfs_mount, bkpinfo->isodir,tmpro);
+                if (bkpinfo->netfs_user) {
+                    mr_strcat(tmp, " -o user=%s", bkpinfo->netfs_user);
+                }
+            else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp, "sshfs -o ro");
+                    mr_asprintf(tmp, "sshfs %s ",tmpro);
                 } else {
-                    mr_asprintf(tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
+                    mr_asprintf(tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro);
                 }
-            } else {
-                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp, "sshfs");
-                } else {
-                    mr_asprintf(tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto);
+                if (bkpinfo->netfs_user) {
+                    mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
                 }
-            }
-            if (bkpinfo->netfs_user) {
-                mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
-            }
-            mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+            }
             run_program_and_log_output(tmp, 3);
             mr_free(tmp);
@@ -3037 +3055 @@
             malloc_string(g_selfmounted_isodir);
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
+            }
         }
         if (!is_this_device_mounted(bkpinfo->netfs_mount)) {
@@ -3193 +3212 @@
         }
 
-
         p = popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with '|'. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", bkpinfo->exclude_paths);
         if (p == NULL) {