Changeset 2628 in MondoRescue for branches/2.2.9/mondo/src/common

Timestamp:

May 11, 2010, 3:44:28 AM (15 years ago)

Author:

Bruno Cornec

Message:

• netfs_proto should be initialized in every case, not just in DR (should solve remaining NULL reports)

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (1 diff)

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

@@ -2367 +2367 @@
             }
         }
+        /*  Force NFS to be the protocol by default */
+        if (bkpinfo->netfs_proto == NULL) {
+            mr_asprintf(&(bkpinfo->netfs_proto), "nfs");
+        }
         if (bkpinfo->disaster_recovery) {
             sprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
             (void)system(command);
-            /*  Force NFS to be the protocol by default */
-            if (bkpinfo->netfs_proto == NULL) {
-                mr_asprintf(&(bkpinfo->netfs_proto), "nfs");
-            }
-            strcpy(tmp1, bkpinfo->netfs_proto);
-            if (!popup_and_get_string
-                ("Network protocol", "Which protocol should I use (nfs/sshfs) ?",
-                 tmp1, MAX_STR_LEN)) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            mr_free(bkpinfo->netfs_proto);
-            mr_asprintf(&(bkpinfo->netfs_proto), "%s", tmp1);
-            if (!popup_and_get_string
-                ("Network share", "Which remote share should I mount?",
-                 bkpinfo->netfs_mount, MAX_STR_LEN)) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-        }
+        }
+        strcpy(tmp1, bkpinfo->netfs_proto);
+        if (!popup_and_get_string
+            ("Network protocol", "Which protocol should I use (nfs/sshfs) ?",
+             tmp1, MAX_STR_LEN)) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->netfs_proto);
+        mr_asprintf(&(bkpinfo->netfs_proto), "%s", tmp1);
+        if (!popup_and_get_string
+            ("Network share", "Which remote share should I mount?",
+             bkpinfo->netfs_mount, MAX_STR_LEN)) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         if (is_this_device_mounted(bkpinfo->netfs_mount)) {