Changeset 2380 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-files.c

Timestamp:

Sep 9, 2009, 8:30:47 PM (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)
• Better logging to detect a potential nuke issue

File:

• branches/2.2.9/mondo/src/common/libmondo-files.c (modified) (2 diffs)

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

@@ -1091 +1091 @@
 
 /**
- * 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[MAX_STR_LEN];
+    char netfs_dev[MAX_STR_LEN];
     char mac_addr[MAX_STR_LEN];
-    char nfs_mount[MAX_STR_LEN];
-    char nfs_client_ipaddr[MAX_STR_LEN];
-    char nfs_client_netmask[MAX_STR_LEN];
-    char nfs_client_broadcast[MAX_STR_LEN];
-    char nfs_client_defgw[MAX_STR_LEN];
-    char nfs_server_ipaddr[MAX_STR_LEN];
+    char netfs_mount[MAX_STR_LEN];
+    char netfs_client_ipaddr[MAX_STR_LEN];
+    char netfs_client_netmask[MAX_STR_LEN];
+    char netfs_client_broadcast[MAX_STR_LEN];
+    char netfs_client_defgw[MAX_STR_LEN];
+    char netfs_server_ipaddr[MAX_STR_LEN];
     char tmp[MAX_STR_LEN];
     char command[MAX_STR_LEN * 2];
@@ -1116 +1116 @@
     char *p;
 
-    log_it("Storing NFS configuration");
-    strcpy(tmp, bkpinfo->nfs_mount);
+    log_it("Storing Network configuration");
+    strcpy(tmp, 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");
+            ("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
-    strcpy(nfs_server_ipaddr, tmp);
-    strcpy(nfs_mount, p);
+    strcpy(netfs_server_ipaddr, tmp);
+    strcpy(netfs_mount, p);
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
+    strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-    strcpy(nfs_client_ipaddr,
+    strcpy(netfs_client_ipaddr,
            call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
-    strcpy(nfs_client_netmask,
+    strcpy(netfs_client_netmask,
            call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
-    strcpy(nfs_client_broadcast,
+    strcpy(netfs_client_broadcast,
            call_program_and_get_last_line_of_output(command));
     sprintf(command,
             "route -n | grep '^0.0.0.0' | awk '{print $2}'");
-    strcpy(nfs_client_defgw,
+    strcpy(netfs_client_defgw,
            call_program_and_get_last_line_of_output(command));
     sprintf(tmp,
-            "nfs_client_ipaddr=%s; nfs_server_ipaddr=%s; nfs_mount=%s",
-            nfs_client_ipaddr, nfs_server_ipaddr, nfs_mount);
-    if (strlen(nfs_dev) < 2) {
+            "netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s",
+            netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
+    if (strlen(netfs_dev) < 2) {
         fatal_error
-            ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
+            ("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);
+    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);
         sprintf(command,
-                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
+                "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
         strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
         sprintf(command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
-        strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
-        log_to_screen("Replacing it with %s\n", nfs_dev);
-    }
-
-    sprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_dev);
-
-    sprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    sprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_netmask);
-    sprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_broadcast);
-    sprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_defgw);
-    sprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    sprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    sprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,netfs_dev);
+        strcpy(netfs_dev, call_program_and_get_last_line_of_output(command));
+        log_to_screen("Replacing it with %s\n", netfs_dev);
+    }
+
+    sprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_dev);
+
+    sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
+
+    sprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    sprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_netmask);
+    sprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_broadcast);
+    sprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_defgw);
+    sprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    sprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
+    sprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
     sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->prefix);
-    log_it("Finished storing NFS configuration");
+    log_it("Finished storing Network configuration");
 }