Changeset 196 in MondoRescue for branches/2.05/mondo

Timestamp:

Dec 14, 2005, 12:04:21 AM (19 years ago)

Author:

bcornec

Message:

Usage of parted2fdisk instead of fdisk everywhere.
on ia64 this is mandatory, and simplifies the infrastructure
on other archs, it doesn't change anything as parted2fdisk here is a link to fdisk

Location:

branches/2.05/mondo

Files:

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

branches/2.05/mondo/ChangeLog

@@ -23 +23 @@
 - disable x11 build by default (Bruno Cornec)
 - remove sbminst (Bruno Cornec/Andree Leidenfrost)
+- use parted2fdisk everywhere (Bruno Cornec)
 
 v2.05 (2005-11-19)

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

@@ -2748 +2748 @@
 
     sprintf(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);
@@ -2904 +2903 @@
     malloc_string(fdisk);
     log_msg(0, "Looking for partition table format type");
-// BERLIOS: Do that temporarily: we need to put back parted2fdisk everywhere
-#ifdef __IA64__
-    sprintf(fdisk, "/usr/local/bin/fdisk");
-    if (stat(fdisk, &buf) != 0) {
-#endif
-        sprintf(fdisk, "/sbin/fdisk");
-#ifdef __IA64__
-    }
-#endif
+    sprintf(fdisk, "/sbin/parted2fdisk");
     log_msg(1, "Using %s", fdisk);
     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);

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

@@ -1189 +1189 @@
     char nfs_client_ipaddr[MAX_STR_LEN];
     char nfs_client_netmask[MAX_STR_LEN];
+    char nfs_client_broadcast[MAX_STR_LEN];
     char nfs_client_defgw[MAX_STR_LEN];
     char nfs_server_ipaddr[MAX_STR_LEN];
@@ -1222 +1223 @@
            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' ' -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}'");
     strcpy(nfs_client_defgw,
@@ -1239 +1244 @@
     }
     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);
@@ -1262 +1267 @@
     sprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_netmask);
+    sprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, nfs_client_broadcast);
     sprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_defgw);

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

@@ -1220 +1220 @@
     }
 
-    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

branches/2.05/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);

branches/2.05/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"

branches/2.05/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