Changeset 672 in MondoRescue for trunk/mondo/mondo

Timestamp:

Jun 12, 2006, 9:55:14 AM (18 years ago)

Author:

bcornec

Message:

merge -r651:671 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/common

Files:

• libmondo-filelist.c (modified) (2 diffs)
• libmondo-files.c (modified) (2 diffs)
• libmondo-raid.c (modified) (3 diffs)
• libmondo-string.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)
• my-stuff.h (modified) (3 diffs)

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

@@ -1271 +1271 @@
     /*@ int **************************************************** */
     int res = 0;
-    int *p_res = &res;
-
     /*@ buffers ************************************************ */
 
@@ -1303 +1301 @@
     if (res) {
         log_OS_error("Call to mondo-makefilelist failed");
-        *p_res++;
         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     } else {

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

@@ -1155 +1155 @@
     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 [ $? = 0 ]; then\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");
@@ -1173 +1177 @@
     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, "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);

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

@@ -967 +967 @@
     // trim leading spaces
     pos = string;
-    while (*pos == ' ') *pos++;
-    asprintf(&string, pos);
-    //
+    while (*pos == ' ') pos += 1;
+    asprintf(&strtmp, pos);
+    strcpy(string, strtmp);
+    paranoid_free(strtmp);
     // if we have newline after only spaces, this is a blank line, update
     // counters, otherwise do normal parsing
@@ -1124 +1125 @@
     } else {
       while (*pos != ' ') {
-        *pos--;
+        pos -= 1;
         if (pos < string) {
           log_it("String underflow!\n");
@@ -1149 +1150 @@
     } else {
       while (*pos != ' ') {
-        *pos--;
+        pos -= 1;
         if (pos < string) {
           printf("ERROR: String underflow!\n");

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

@@ -1160 +1160 @@
 token = malloc(sizeof(*token)*(pos1+1));
 strncpy(token, strptr, pos1);
+token[pos1] = '\0';
 *lastpos = *lastpos + pos1 + pos2 + 1;
 

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

@@ -506 +506 @@
         }
         if (bkpinfo->nonbootable_backup) {
-            asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", mrconf->mondo_iso_creation_cmd);
         } else if
 #ifdef __FreeBSD__

trunk/mondo/mondo/common/my-stuff.h

@@ -210 +210 @@
  */
 #define MONDO_MKISOFS_REGULAR_SYSLINUX  "mkisofs -J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_LILO      "mkisofs -J -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
+#define MONDO_MKISOFS_REGULAR_ELILO     "mkisofs -no-emul-boot -b images/mindi-bootroot.8192.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
 
 /**
@@ -215 +217 @@
  */
 // -b images/mindi-boot.2880.img
-#define MONDO_MKISOFS_REGULAR_LILO      "mkisofs -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
 
 /**
@@ -222 +223 @@
 // -b images/mindi-boot.2880.img
 // Should replace 8192 by IA64_BOOT_SIZE
-#define MONDO_MKISOFS_REGULAR_ELILO      "mkisofs -no-emul-boot -b images/mindi-bootroot.8192.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
 
 /**