Changeset 197 in MondoRescue

Timestamp:

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

Author:

bcornec

Message:

merge -r193:196 $SVN_M/branches/2.05

Location:

trunk

Files:

• mindi/CHANGES (modified) (1 diff)
• mindi/README.ia64 (modified) (2 diffs)
• mindi/aux-tools/sbin/calc-disk-size (modified) (1 diff)
• mindi/aux-tools/sbin/format-and-kludge-vfat (modified) (1 diff)
• mindi/deplist.txt (modified) (1 diff)
• mindi/install.sh (modified) (2 diffs)
• mindi/mindi (modified) (3 diffs)
• mindi/mindi.spec (modified) (1 diff)
• mindi/parted2fdisk.pl (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/ChangeLog (modified) (1 diff)
• mondo/mondo/common/libmondo-devices.c (modified) (2 diffs)
• mondo/mondo/common/libmondo-files.c (modified) (4 diffs)
• mondo/mondo/common/libmondo-tools.c (modified) (1 diff)
• mondo/mondo/mondoarchive/main.c (modified) (1 diff)
• mondo/mondo/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/mondo/restore-scripts/mondo/grub-MR (modified) (1 diff)
• mondo/mondo/restore-scripts/mondo/make-me-bootable (modified) (1 diff)

trunk/mindi/CHANGES

@@ -9 +9 @@
 - USB keyboard support (Bruno Cornec)
 - -p should now work with ISO/PXE/NFS modes (Bruno Cornec)
+- relocate what was under /usr/share to /usr/lib (FHS compliance) 
+  (Bruno Cornec/Andree Leidenfrost)
+- manage non ambiguous delivery under /usr (packages) or /usr/local (tar ball)
+  (Bruno Cornec)
+- use parted2fdisk everywhere (Bruno Cornec)
 
 1.05 (2005-11-19)

trunk/mindi/README.ia64

@@ -3 +3 @@
 Linux distributions on ia64 uses a different file table format than on i386, called GPT instead of MBR. The fdisk command used by mindi/mondo to determine all aspects related to the disc hasn't been adapted yet to handle GPT. Only the parted command is able to do it.
 
-So I've written a perl script called parted2fdisk.pl that will take as input all the order that mindi/mondo pass to fdisk, translate them to be given to parted and print the result in fdisk format. So this is a filter allowing fdisk replacement.
+So a perl script called parted2fdisk.pl was written that will take as input all the order that mindi/mondo pass to fdisk, translate them to be given to parted and print the result in fdisk format. So this is a filter allowing fdisk replacement. It's only used on ia64. On other archs, parted2fdisk is a link to fdisk.
 
-To use it on the system to backup, please do the following as root:
-
-mv /sbin/fdisk /usr/local/bin/fdisk
-ln -sf /sbin/parted2fdisk.pl /sbin/fdisk
-Verify that /usr/local/bin is in your path or add it.
-
-The mindi.rpm package will do that automatically for you.
-
-Thus mindi/mondo launched by root will smoothly pass all their call to parted2fdisk.pl instead of the real fdisk, and be able to support the GPT format.
-The existing fdisk command on your system needs to remain accessible in your path as parted2fdisk.pl uses it.
+Thus mindi/mondo launched by root will pass all their call to parted2fdisk instead of the real fdisk, and be able to support the GPT format. It will call fdisk and parted for its work.
 
 To get it on the system to restore, please do the following as root:
@@ -22 +13 @@
 mv rootfs/sbin/parted2fdisk-ia64 rootfs/sbin/parted2fdisk
 
-This will produce a binary version that will be used by mondorestore during the restoration process on ia64 to handle the GPT format. (Note that on ia32 parte2fdisk is in fact a link to fdisk to avoid any compatibility issue)
-So in the restoration environment on ia64, /sbin/fdisk is in fact the result of the compilation of parted2fdisk, and the real ia64 fdisk is placed under /usr/local/bin (result of the previous setup on the machine to backup)
+This will produce a binary version that will be used by mondorestore during the restoration process on ia64 to handle the GPT format. (Note again that on ia32 parte2fdisk is in fact a link to fdisk to avoid any compatibility issue)
 
-Again the mindi.rpm package will do that automatically for you.
+The install.sh script will setup everything correctly for you.
 
 Note that parted2fdisk.pl supports currently only the -l and -s options as well as the commands p,n,d,w,t,a,q
 
-Please report any problem around that tool to bruno.cornec@hp.com
+Please report any problem around that tool to bcornec@users.berlios.de
 Bruno.
 
+2005-12-12 parted2fdisk used everywhere
 2005-03-23 Explain compilation and backup/restore split
 2004-09-16 Initial file

trunk/mindi/aux-tools/sbin/calc-disk-size

@@ -6 +6 @@
 CalcDiskSize() {
     local res cylinders sectorsize disksize i curr stub out
-    res=`fdisk -l $1 2> /dev/null | grep -i "cylinders of"`
+    res=`parted2fdisk -l $1 2> /dev/null | grep -i "cylinders of"`
     cylinders=`echo "$res" | cut -d' ' -f5`
     sectorsize=`echo "$res" | cut -d' ' -f7`
-    cylindermod=`fdisk -l $1 2> /dev/null | grep -i $1:`; # note colon at end to make sure it's not the /dev/sda# partition info
+    cylindermod=`parted2fdisk -l $1 2> /dev/null | grep -i $1:`; # note colon at end to make sure it's not the /dev/sda# partition info
     cylnum=`echo "$cylindermod" | cut -d' ' -f7`
     predisksize=$(($cylinders*$sectorsize/1024))

trunk/mindi/aux-tools/sbin/format-and-kludge-vfat

@@ -28 +28 @@
     device=$1
     drive=$2
-    ftype=`fdisk -l $drive | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
+    ftype=`parted2fdisk -l $drive | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
     case $ftype in
 #   "b" | "c")

trunk/mindi/deplist.txt

@@ -45 +45 @@
 ping devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
 
-# For ia64
-/usr/local/bin/fdisk
-
 # ------------------------------- for X (Hugo) --------------------------------
 #tar

trunk/mindi/install.sh

@@ -71 +71 @@
 
 if [ "$ARCH" = "i386" ] ; then
+    (cd $local/sbin && ln -s fdisk parted2fdisk)
     if [ -f $local/lib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
         echo "Installing busybox.net ..."
@@ -80 +81 @@
 
 if [ "$ARCH" = "ia64" ] ; then
+    (cd $local/sbin && ln -s parted2fdisk.pl parted2fdisk)
     make -f Makefile.parted2fdisk DEST=$local/lib/mindi install
     if [ -f $local/lib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then

trunk/mindi/mindi

@@ -132 +132 @@
     which afio > /dev/null 2> /dev/null || LogIt "afio not found... mindi doesn't need afio but Mondo does... Be aware...\n"
     [ ! -e "/etc/issue.net" ] && > /etc/issue.net
-    FDISK=$MINDI_SBIN/parted2fdisk.pl
+    FDISK=$MINDI_SBIN/parted2fdisk
     FDISKLOG=/tmp/parted2fdisk.log
     touch $FDISKLOG
@@ -1207 +1207 @@
    AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
    AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
+   AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-BROADCAST nfs-client-broadcast $outfile
    AddFileToCfgIfExists $MONDO_TMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
    AddFileToCfgIfExists $MONDO_TMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
@@ -1327 +1328 @@
     all_partitions=""
     
-# Workaround until fdisk2parted.pl is fixed
-    [ "$ARCH" != "ia64" ] && FDISK=`which fdisk`
-# End workaround - Hugo, 06/20/2004
-
     if [ -d "/proc/lvm" ] || [ -d "/dev/mapper" ]; then
     echo -en "\rAnalyzing LVM...\r"

trunk/mindi/mindi.spec

@@ -78 +78 @@
     echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
 fi
-
-%ifarch ia64
-    %{__mkdir_p} /usr/local/bin
-    if [ "`file /sbin/fdisk |grep 'LF 64-bit LSB executable'`" ] ; then
-        %{__cp} /sbin/fdisk /sbin/fdisk.mondosav
-        %{__mv} /sbin/fdisk /usr/local/bin/fdisk
-        %{__ln_s} -f /usr/sbin/parted2fdisk.pl /sbin/fdisk
-        echo "Warning: you fdisk binary is now under /usr/local/bin"
-    fi
-%endif
 
 %files

trunk/mindi/parted2fdisk.pl

@@ -306 +306 @@
 my $cmd = shift;
 my $basename = basename($cmd);
-my $mindifdisk="/usr/local/bin/fdisk";
-
-if ($cmd =~ /fdisk/) {
-    if ($arch =~ /^ia64/) {
-        if (-l $cmd) {
-            print FLOG "Your system is ready for mondo-archive on ia64\n";
-        } else {
-            print FLOG "Your system is ready for mondo-restore on ia64\n";
-        }
-        if (-x $mindifdisk) {
-            $cmd = $mindifdisk;
-        } else {
-            print FLOG "Your system doesn't provide $mindifdisk\n";
-            print FLOG "Please use mindi-x.yz-ia64.rpm on the system to backup\n";
-            myexit(-1);
-        }
-    }
-}
+
 if (not (-x $cmd)) {
     print FLOG "Your system is not LSB/mondo compliant: $basename was not found as $cmd\n";

trunk/mindi/rootfs/sbin/init

@@ -678 +678 @@
     cp -af /dev/md2 /dev/md/2 2> /dev/null
 fi
-# As described in the README.ia64 we replaced on the native system
-# /sbin/fdisk by parted2fdisk.pl now we need the reverse for mindi's
-# boot environment
 export ARCH=`/bin/arch`
-if [ "$ARCH" = "ia64" ] ; then
-    rm -f /sbin/fdisk
-    ln /sbin/parted2fdisk /sbin/fdisk
-fi
 WelcomeMessage
 # SpaceTests; # Mandrake Linux 8.1 doesn't like this

trunk/mondo/ChangeLog

@@ -22 +22 @@
 - Quadrupled ARBITRARY_MAXIMUM from 500 to 2000 for mondorestore's filebrowser
   (Andree Leidenfrost)
+- remove the renice of mondoarchive (Hugo Rabson)
+- relocate what was under /usr/share to /usr/lib (FHS compliance) 
+  (Bruno Cornec/Andree Leidenfrost)
+- manage non ambiguous delivery under /usr (packages) or /usr/local (tar ball)
+  (Bruno Cornec)
+- disable x11 build by default (Bruno Cornec)
+- remove sbminst (Bruno Cornec/Andree Leidenfrost)
+- use parted2fdisk everywhere (Bruno Cornec)
 
 v2.05 (2005-11-19)

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