Changeset 2382 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Sep 10, 2009, 2:07:16 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Change NFS support into a NetFS support to allow for multiple protocol in addition to NFS (NEEDS TESTING)

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (3 diffs)

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -1059 +1059 @@
 
 /**
- * Store the client's NFS configuration in files to be restored at restore-time.
- * Assumes that @c bkpinfo->media_type = nfs, but does not check for this.
+ * Store the client's NETFS configuration in files to be restored at restore-time.
+ * Assumes that @c bkpinfo->media_type = netfs, but does not check for this.
  * @param bkpinfo The backup information structure. Fields used:
- * - @c nfs_mount
- * - @c nfs_remote_dir
+ * - @c netfs_mount
+ * - @c netfs_remote_dir
  * - @c tmpdir
  */
-void store_nfs_config()
+void store_netfs_config()
 {
 
     /*@ buffers ******** */
-    char *nfs_dev = NULL;
+    char *netfs_dev = NULL;
     char *mac_addr = NULL;
-    char *nfs_mount = NULL;
-    char *nfs_client_ipaddr = NULL;
-    char *nfs_client_netmask = NULL;
-    char *nfs_client_broadcast = NULL;
-    char *nfs_client_defgw = NULL;
-    char *nfs_server_ipaddr = NULL;
+    char *netfs_mount = NULL;
+    char *netfs_client_ipaddr = NULL;
+    char *netfs_client_netmask = NULL;
+    char *netfs_client_broadcast = NULL;
+    char *netfs_client_defgw = NULL;
+    char *netfs_server_ipaddr = NULL;
     char *tmp = NULL;
     char *command = NULL;
@@ -1084 +1084 @@
     char *p;
 
-    if (! bkpinfo->nfs_mount) {
-        fatal_error("No nfs_mount found !");
-    }
-
-    log_it("Storing NFS configuration");
-    mr_asprintf(tmp, "%s", bkpinfo->nfs_mount);
+    if (! bkpinfo->netfs_mount) {
+        fatal_error("No netfs_mount found !");
+    }
+
+    log_it("Storing Network configuration");
+    mr_asprintf(tmp, "%s", bkpinfo->netfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
-        fatal_error("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+        fatal_error("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
-    mr_asprintf(nfs_server_ipaddr, "%s", tmp);
-    mr_asprintf(nfs_mount, "%s", p);
+    mr_asprintf(netfs_server_ipaddr, "%s", tmp);
+    mr_asprintf(netfs_mount, "%s", p);
     mr_free(tmp);
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     mr_asprintf(command, "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    mr_asprintf(nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-    mr_asprintf(nfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
-    mr_asprintf(nfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
-    mr_asprintf(nfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "route -n | grep '^0.0.0.0' | awk '{print $2}'");
-    mr_asprintf(nfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    if (strlen(nfs_dev) < 2) {
-        fatal_error
-            ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
-    }
+    mr_asprintf(netfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    if (strlen(netfs_dev) < 2) {
+        fatal_error("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
+    }
+
     /********
-    * If the NFS device that found above is a bonded device, 
+    * If the Network device that found above is a bonded device, 
     * we need to replace it with an ethN device or the
-    * networking will not start during an NFS restore.
+    * networking will not start during an Network restore.
     *
-    * If the NFS device in nfs_dev begins with the word "bond", or alb or aft
-    * look for the corresponding slave ethN device and copy it to nfs_dev.
+    * If the Network device in netfs_dev begins with the word "bond", or alb or aft
+    * look for the corresponding slave ethN device and copy it to netfs_dev.
     * Using the common MAC address
     ********/
-    if (!strncmp(nfs_dev, "bond", 4) || !strncmp(nfs_dev, "alb", 3) || !strncmp(nfs_dev, "aft", 3)) {
-        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
-        mr_asprintf(command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
+    if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
+        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
+        mr_asprintf(command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
         mr_asprintf(mac_addr, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
-        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
+        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,netfs_dev);
         mr_free(mac_addr);
-        mr_free(nfs_dev);
-
-        mr_asprintf(nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(netfs_dev);
+
+        mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
-        log_to_screen("Replacing it with %s\n", nfs_dev);
-    }
-
-    mr_asprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_dev);
-    mr_free(nfs_dev);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    mr_free(nfs_client_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_netmask);
-    mr_free(nfs_client_netmask);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_broadcast);
-    mr_free(nfs_client_broadcast);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_defgw);
-    mr_free(nfs_client_defgw);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    mr_free(tmp);
-    mr_free(nfs_server_ipaddr);
-
-    mr_asprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    mr_free(tmp);
-    mr_free(nfs_mount);
-
-    mr_asprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
+        log_to_screen("Replacing it with %s\n", netfs_dev);
+    }
+
+    mr_asprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_dev);
+    mr_free(netfs_dev);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    mr_free(netfs_client_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_netmask);
+    mr_free(netfs_client_netmask);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_broadcast);
+    mr_free(netfs_client_broadcast);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_defgw);
+    mr_free(netfs_client_defgw);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    mr_free(tmp);
+    mr_free(netfs_server_ipaddr);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
+    mr_free(tmp);
+    mr_free(netfs_mount);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
     mr_free(tmp);
 
@@ -1192 +1195 @@
     mr_free(tmp);
 
-    log_it("Finished storing NFS configuration");
+    log_it("Finished storing Network configuration");
 }