Changeset 148 in MondoRescue for branches/2.05/mondo/mondo/common/libmondo-files.c

Timestamp:

Dec 2, 2005, 8:22:32 PM (18 years ago)

Author:

bcornec

Message:

• Bug on USB keyboard corrected
• PXE mode reviewed (netmask and route management added in start-nfs)
• -p option with PXE doesn't require a parameter anymore and it now works with the parameter
• -p option should work correctly with iso and nfs modes
• cosmetic messages improvement for mindi
• use STD_PREFIX

File:

• branches/2.05/mondo/mondo/common/libmondo-files.c (modified) (5 diffs)

branches/2.05/mondo/mondo/common/libmondo-files.c

@@ -1188 +1188 @@
     char nfs_mount[MAX_STR_LEN];
     char nfs_client_ipaddr[MAX_STR_LEN];
+    char nfs_client_netmask[MAX_STR_LEN];
+    char nfs_client_defgw[MAX_STR_LEN];
     char nfs_server_ipaddr[MAX_STR_LEN];
     char tmp[MAX_STR_LEN];
@@ -1215 +1217 @@
     strcpy(nfs_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,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "route | egrep '^default' | awk '{printf $2}'");
+    strcpy(nfs_client_defgw,
+           call_program_and_get_last_line_of_output(command));
     sprintf(tmp,
             "nfs_client_ipaddr=%s; nfs_server_ipaddr=%s; nfs_mount=%s",
@@ -1229 +1239 @@
     }
     fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
-    fprintf(fout, "ifconfig %s %s   # config client\n", nfs_dev,
-            nfs_client_ipaddr);
+    fprintf(fout, "ifconfig %s %s netmask %s    # config client\n", nfs_dev,
+            nfs_client_ipaddr, nfs_client_netmask);
+    fprintf(fout, "route add default gw %s  # default route\n", nfs_client_defgw);
     fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
     fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
@@ -1249 +1260 @@
     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-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);
@@ -1255 +1270 @@
     sprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
+    sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->prefix);
     log_it("Finished storing NFS configuration");
 }