Changeset 764 in MondoRescue for trunk/mondo/mondo

Timestamp:

Aug 8, 2006, 12:34:37 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r728:763 $SVN_M/branches/stable

Location:

trunk/mondo/mondo

Files:

• Makefile.am (modified) (1 diff)
• common/libmondo-files.c (modified) (3 diffs)
• common/newt-specific.c (modified) (2 diffs)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondo-rstr-newt.c (modified) (6 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

trunk/mondo/mondo/Makefile.am

@@ -4 +4 @@
 pkgdata_DATA   = do-not-compress-these
 scriptdir      = $(pkgdatadir)
-script_DATA    = autorun
-
-install-data-hook:
-    @for prog in $(script_DATA); do \
-      chmod +x $(scriptdir)/$$prog; \
-    done
+script_SCRIPTS    = autorun

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

@@ -1058 +1058 @@
 
     /*@ buffers ******** */
-    char *outfile = NULL;
     char *nfs_dev = NULL;
     char *nfs_mount = NULL;
@@ -1071 +1070 @@
     /*@ pointers ***** */
     char *p;
-    FILE *fout;
-
-
 
     log_it("Storing NFS configuration");
@@ -1123 +1119 @@
             ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
     }
-    asprintf(&outfile, "%s/start-nfs", bkpinfo->tmpdir);
-    asprintf(&tmp, "outfile = %s", outfile);
-    log_it(tmp);
-    paranoid_free(tmp);
-
-    if (!(fout = fopen(outfile, "w"))) {
-        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, "ipdev=%s\n", nfs_dev);
-    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, "nfsmount=%s\n", bkpinfo->nfs_mount);
-    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, "    echo $i | grep -qi nfsmount= && nfsmount=`echo $i | cut -d= -f2`\n");
-    fprintf(fout, "done\n");
-    fprintf(fout, "nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`\n");
-    fprintf(fout, "echo \"$ipconf\" | grep -q \"dhcp\"\n");
-    fprintf(fout, "if [ $? -eq 0 ]; then\n");
-    fprintf(fout, "    ipdev=`echo $ipconf | cut -d: -f1`\n");
-    fprintf(fout, "    echo \"Making DHCP request on $ipdev\"\n");
-    fprintf(fout, "    udhcpc -i $ipdev\n");
-    fprintf(fout, "else\n");
-    fprintf(fout, "    if [ \"$ipconf\" != \"\" ]; then\n");
-    fprintf(fout, "        ipdev=`echo $ipconf | cut -d: -f1`\n");
-    fprintf(fout, "        ipaddress=`echo $ipconf | cut -d: -f2`\n");
-    fprintf(fout, "        ipnetmask=`echo $ipconf | cut -d: -f3`\n");
-    fprintf(fout, "        ipbroadcast=`echo $ipconf | cut -d: -f4`\n");
-    fprintf(fout, "        ipgateway=`echo $ipconf | cut -d: -f5`\n");
-    fprintf(fout, "    fi\n");
-    fprintf(fout, "    ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast\n");
-    fprintf(fout, "    route add default gw $ipgateway\n");
-    fprintf(fout, "fi\n");
-    fprintf(fout, "ping -c $ipcount $nfs_server_ipaddr # ping server\n");
-    fprintf(fout, "mount -t nfs -o nolock $nfsmount /tmp/isodir\n");
-    paranoid_fclose(fout);
-    chmod(outfile, 0777);
     make_hole_for_dir("/var/cache/mondo-archive");
-
-//  paranoid_system ("mkdir -p /var/cache/mondo-archive 2> /dev/null");
-
-    asprintf(&tmp, "cp -f %s /var/cache/mondo-archive", outfile);
-    paranoid_free(outfile);
-
-    run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
 
     asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);

trunk/mondo/mondo/common/newt-specific.c

@@ -1457 +1457 @@
 
         /*@ int ************************************************************* */
-        int i = 0;
         int currline = 0;
         int finished = FALSE;
+
+        /*@ long ************************************************************ */
+        long i = 0;
         long lng = 0;
 
@@ -1504 +1506 @@
         }
         asprintf(&differ_sz,
-                 _("  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
+                 _("  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
                  i);
         newtPushHelpLine(differ_sz);

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -2190 +2190 @@
 #else
     asprintf(&program, "raidstart %s", raid_device);
-//      sprintf (program, "raidstart " RAID_DEVICE_STUB "*");
 #endif
     log_msg(1, "program = %s", program);

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -883 +883 @@
     static int lines_in_flist_window = 0;
     static int depth = 0;
-    int i = 0;
+
+    /** long **************************************************************/
+    long i = 0;
 
     /** structures *******************************************************/
@@ -1363 +1365 @@
     paranoid_free(size_str);
 
-    newtListboxSetEntry(listbox, (int) keylist[currline],
+    newtListboxSetEntry(listbox, (long) keylist[currline],
                         mountlist_entry_to_string(mountlist, currline));
     /* if new /dev/md RAID device then do funky stuff */
@@ -2489 +2491 @@
 {
 
-    /** int *************************************************************/
-    int i = 0;
+    /** long **************************************************************/
+    long i = 0;
 
     assert(disklist != NULL);
@@ -2521 +2523 @@
 {
 
-    /** int **************************************************************/
-    int i = 0;
+    /** long **************************************************************/
+    long i = 0;
 
     assert(mountlist != NULL);
@@ -2554 +2556 @@
 {
 
-    /** int **************************************************************/
-    int i = 0;
+    /** long *************************************************************/
+    long i = 0;
 
     /** buffers **********************************************************/
@@ -2590 +2592 @@
                 void *keylist[], newtComponent listbox)
 {
-    /** int *************************************************************/
-    int i = 0;
+    /** long ************************************************************/
+    long i = 0;
 
     /** buffers *********************************************************/

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -2155 +2155 @@
     asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
     asprintf(&tmp,
-            "(sleep 15; kill `ps ax | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
+            "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
     log_msg(1, "tmp = '%s'", tmp);