Changeset 197 in MondoRescue for trunk/mondo/mondo

Timestamp:

Dec 14, 2005, 12:12:15 AM (18 years ago)

Author:

bcornec

Message:

merge -r193:196 $SVN_M/branches/2.05

Location:

trunk/mondo/mondo

Files:

• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-files.c (modified) (4 diffs)
• common/libmondo-tools.c (modified) (1 diff)
• mondoarchive/main.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)
• restore-scripts/mondo/grub-MR (modified) (1 diff)
• restore-scripts/mondo/make-me-bootable (modified) (1 diff)

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

@@ -2264 +2264 @@
     assert(which_device != NULL);
     asprintf(&list_drives_cmd,
-            // "parted2fdisk
-            "fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
+            "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
             where_is_root_mounted());
     log_it("list_drives_cmd = %s", list_drives_cmd);
@@ -2419 +2418 @@
 
     log_msg(0, "Looking for partition table format type");
-// BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
-#ifdef __IA64__
-    struct stat buf;
-
-    asprintf(&fdisk, "/usr/local/bin/fdisk");
-    if (stat(fdisk, &buf) != 0) {
-        paranoid_free(fdisk);
-#endif
-        asprintf(&fdisk, "/sbin/fdisk");
-#ifdef __IA64__
-    }
-#endif
+    asprintf(&fdisk, "/sbin/parted2fdisk");
     log_msg(1, "Using %s", fdisk);
     asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);

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

@@ -1038 +1038 @@
     char *nfs_client_ipaddr;
     char *nfs_client_netmask;
+    char *nfs_client_broadcast;;
     char *nfs_client_defgw;
     char *nfs_server_ipaddr;
@@ -1079 +1080 @@
 
     asprintf(&command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
+    strcpy(nfs_client_broadcast,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(command,
             "route -n | grep '^0.0.0.0' | awk '{printf $2}'");
     asprintf(&nfs_client_defgw,
@@ -1104 +1109 @@
     }
     fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
-    fprintf(fout, "ifconfig %s %s netmask %s    # config client\n", nfs_dev,
-            nfs_client_ipaddr, nfs_client_netmask);
+    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);
@@ -1141 +1146 @@
     write_one_liner_data_file(tmp, nfs_client_defgw);
     paranoid_free(nfs_client_defgw);
+    paranoid_free(tmp);
+
+    asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, nfs_client_broadcast);
+    paranoid_free(nfs_client_broadcast);
     paranoid_free(tmp);
 

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

@@ -993 +993 @@
     }
 
-    if (!run_program_and_log_output("fdisk -l | grep -i raid", 1)
+    if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1)
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen

trunk/mondo/mondo/mondoarchive/main.c

@@ -188 +188 @@
     register_pid(g_main_pid, "mondo");
     set_signals(TRUE);          // catch SIGTERM, etc.
-    nice(10);
     run_program_and_log_output("date", 1);
     run_program_and_log_output("dmesg -n1", TRUE);

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

@@ -1525 +1525 @@
 #else
     make_hole_for_file(FDISK_LOG);
-#ifdef __IA64__
-    sprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG,
-            FDISK_LOG);
-#else
-    sprintf(tmp, "fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
-#endif
+    sprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
     pout_to_fdisk = popen(tmp, "w");
     if (!pout_to_fdisk) {
-        log_to_screen("Cannot call fdisk to configure %s", drivename);
+        log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
         paranoid_free(device_str);
         paranoid_free(format);

trunk/mondo/mondo/restore-scripts/mondo/grub-MR

@@ -166 +166 @@
     line=`cat /proc/mdstat | grep $base | head -n1`
     echo "mbrpart was $mbrpart"
-    mbrpart=`fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' \
+    mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' \
 | cut -d' ' -f2`
     echo "mbrpart is $mbrpart"

trunk/mondo/mondo/restore-scripts/mondo/make-me-bootable

@@ -31 +31 @@
             boot_drv=$drive
             boot_part=$partno
-#       if [ "$mountpt" = "/" ] || [ "$mountpt" = "/boot" ] || [ "$format" = "vfat" ] ; then
-#           LogIt "Making $i bootable (drive=$drive, partno=$partno)"
-#           echo -e -n "a\n$partno\nw\n" | fdisk $drive >> $LOGFILE 2>> $LOGFILE
-#            HAVE_ACTIVE="true"
         fi
     fi