Changeset 236 in MondoRescue for trunk/mondo

Timestamp:

Dec 19, 2005, 7:31:56 PM (18 years ago)

Author:

bcornec

Message:

merge -r229:235 $SVN_M/branches/2.05

Location:

trunk/mondo

Files:

• mondo.spec (modified) (1 diff)
• mondo/common/libmondo-devices.c (modified) (1 diff)
• mondo/common/libmondo-files.c (modified) (1 diff)

trunk/mondo/mondo.spec

@@ -30 +30 @@
 %endif
 
+%if %is_suse
+%define src     %{name}-%{version}.tgz
+Group:          Archiving/Backup
+%endif
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1714 +1714 @@
             paranoid_free(command);
 
-            asprintf(&tmp, "mount %s -t nfs %s", bkpinfo->nfs_mount,
+            asprintf(&tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount,
                     bkpinfo->isodir);
             run_program_and_log_output(tmp, 5);

trunk/mondo/mondo/common/libmondo-files.c

@@ -1108 +1108 @@
         fatal_error("Cannot store NFS config");
     }
+    fprintf(fout, "#!/bin/sh\n");
+    fprintf(fout, "# number of ping\n");
+    fprintf(fout, "ipcount=3\n");
+    fprintf(fout, "for i in `cat /proc/cmdline` ; do\n");
+    fprintf(fout, "    echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`\n");
+    fprintf(fout, "done\n");
     fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
-    fprintf(fout, "ifconfig %s %s netmask %s broadcast %s   # config client\n", nfs_dev,
-            nfs_client_ipaddr, nfs_client_netmask, nfs_client_broadcast);
-    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, "ipaddress=%s\n", nfs_client_ipaddr);
+    fprintf(fout, "ipnetmask=%s\n", nfs_client_netmask);
+    fprintf(fout, "ipbroadcast=%s\n", nfs_client_broadcast);
+    fprintf(fout, "ipgateway=%s\n", nfs_client_defgw);
+    fprintf(fout, "ipconf=\n");
+    fprintf(fout, "for i in `cat /proc/cmdline` ; do\n");
+    fprintf(fout, "    echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`\n");
+    fprintf(fout, "done\n");
+    fprintf(fout, "if [ \"$ipconf\" = \"dhcp\" ]; then\n");
+    fprintf(fout, "    udhcpc -i %s\n", nfs_dev);
+    fprintf(fout, "else\n");
+    fprintf(fout, "    if [ \"$ipconf\" != \"\" ]; then\n");
+    fprintf(fout, "        ipaddress=`echo $ipconf | cut -d: -f1`\n");
+    fprintf(fout, "        ipnetmask=`echo $ipconf | cut -d: -f2`\n");
+    fprintf(fout, "        ipbroadcast=`echo $ipconf | cut -d: -f3`\n");
+    fprintf(fout, "        ipgateway=`echo $ipconf | cut -d: -f4`\n");
+    fprintf(fout, "    fi\n");
+    fprintf(fout, "    ifconfig %s $ipaddress netmask $ipnetmask broadcast $ipbroadcast\n", nfs_dev);
+    fprintf(fout, "    route add default gw $ipgateway\n");
+    fprintf(fout, "fi\n");
+    fprintf(fout, "ping -c $ipcount %s  # ping server\n", nfs_server_ipaddr);
     fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
             bkpinfo->nfs_mount);
-    fprintf(fout, "exit 0\n");
     paranoid_fclose(fout);
     chmod(outfile, 0777);