Changeset 3272 in MondoRescue

Timestamp:

Apr 29, 2014, 9:24:56 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Removes now useles code from the C part which has been moved into mr-net-get-config (remains to handle bonding cases)

File:

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

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

@@ -1112 +1112 @@
 
     log_it("Storing Network configuration");
-    mr_asprintf(tmp, "%s", bkpinfo->netfs_mount);
-    p = strchr(tmp, ':');
-    if (!p) {
-        fatal_error("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
-    }
-    *(p++) = '\0';
-    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, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    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(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(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(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(netfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    mr_asprintf(command, "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
-    mr_asprintf(netfs_client_hwaddr, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    log_it("netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s", netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
-    if (strlen(netfs_dev) < 2) {
-        fatal_error("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
-    }
 
     /********
@@ -1169 +1130 @@
     }
 
-    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-CLIENT-HWADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_hwaddr);
-    mr_free(netfs_client_hwaddr);
-    mr_free(tmp);
-
-    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(netfs_server_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
-    mr_free(tmp);
-
-    if (bkpinfo->netfs_user) {
-        mr_asprintf(tmp, "%s/NETFS-SERVER-USER", bkpinfo->tmpdir);
-        write_one_liner_data_file(tmp, bkpinfo->netfs_user);
-        mr_free(tmp);
-    }
-    mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->prefix);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
-    mr_free(tmp);
-
-
     log_it("Finished storing Network configuration");
 }