Changeset 518 in MondoRescue for trunk

Timestamp:

May 1, 2006, 1:42:39 AM (18 years ago)

Author:

bcornec

Message:

merge -r 506:516 $SVN_M/branches/stable

Location:

trunk

Files:

• documentation/Makefile.howto (modified) (1 diff)
• mindi/mindi (modified) (2 diffs)
• mindi/rootfs/usr/share/udhcpc (copied) (copied from branches/stable/mindi/rootfs/usr/share/udhcpc )
• mondo/compile (deleted)
• mondo/mkinstalldirs (deleted)
• mondo/mondo/common/mondostructures.h (modified) (2 diffs)
• mondo/mondo/common/my-stuff.h (modified) (1 diff)
• tools/livwww (modified) (2 diffs)

trunk/documentation/Makefile.howto

@@ -34 +34 @@
     @rm -fr $(TARGET)
     @docbook2html -d $(TARGET).dsl'#html' -o $(TARGET) $(TARGET).sgml
-    @ln -sf $(IMAGESDIR) $(TARGET)
+    @(cd $(TARGET) ; ln -sf ../$(IMAGESDIR) .)
 
 $(TARGET).html: $(SRC) $(DSL) $(IMAGES)

trunk/mindi/mindi

@@ -132 +132 @@
 CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
 NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
-EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
+EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
 LOGFILE=/var/log/mindi.log
 
@@ -1382 +1382 @@
     [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
     if [ -h "$c_p" ] && [ "`echo "$c_p" | fgrep "/dev/hd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/sd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/md"`" = "" ] ; then
-            current_partition=`ResolveSoftlink $c_p`
+        current_partition=`ResolveSoftlink $c_p`
         [ "`echo "$current_partition" | fgrep "/dev/mapper"`" != "" ] && current_partition="$c_p"
-            [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
+        [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
     else
         current_partition="$c_p"
     fi
     [ "$c_p" = "none" ] && continue
-        absolute_partition=`ResolveSoftlink $c_p`
+    absolute_partition=`ResolveSoftlink $c_p`
     partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
+
+    # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
+    # current_partition contains only first column of /etc/fstab
     redhat_label=""
-    if [ "`echo "$current_partition" | fgrep -i "LABEL=SWAP"`" != "" ] ; then
-            redhat_label=`echo "$current_partition" | cut -d'=' -f2`
-            actual_dev="/dev/`echo "$redhat_label" | cut -d '-' -f2`"
-            current_partition=$actual_dev
-    elif [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
+    if [ "`echo "$current_partition" | /bin/grep -f -i "LABEL="`" != "" ] ; then
         str_to_find_fmt_with=$current_partition
-        redhat_label=`echo "$current_partition" | cut -d'=' -f2`
-        actual_dev=`mount -l | fgrep " [$redhat_label]" | cut -d' ' -f1`
-#       partition_mountpt=$redhat_label
-        current_partition=$actual_dev
+        redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
+        actual_dev=""
+
+        # 1st try : blkid, the good way
+        if [ -x "/sbin/blkid" ] ; then
+            actual_dev=`/sbin/blkid | grep "$current_partition" | /bin/cut -d':' -f1`
+        fi
+        # 2nd try, which works on a standard partition (ext2/3), but not on swap
+        if [ $actual_dev="" ] ; then
+            actual_dev=`/bin/mount -l | /bin/grep " [$redhat_label]" | /bin/cut -d' ' -f1`
+        fi
+        # 3rd try, with vol_id (which works with swap)
+        if [ $actual_dev="" -a -x "/sbin/vol_id" ] ; then
+                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
+                for dev_swap in $list_swaps ; do
+                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep -f "$redhat_label"`
+                    if [ -n "$dev_exists" ] ; then
+                        actual_dev=$dev_swap
+                        break;
+                    fi
+                done
+        fi
+        # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
+        if [ $actual_dev="" -a  "`echo "$current_partition" | /bin/grep -f -i "LABEL=SWAP"`" != ""] ; then
+                actual_dev="/dev/`echo "$redhat_label" | /bin/cut -d '-' -f2`"
+        fi
+        # Check if one of all those tries has known success
+        if [  $actual_dev != "" ] ; then
+                current_partition=$actual_dev
+        else
+            Die "Your system uses a labelled swap partition, but you lack the tool to su
+pport it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
+        fi
     else
         str_to_find_fmt_with=$current_partition
     fi
+
     partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
     if [ -d "/proc/lvm" ] && [ "`lvdisplay $current_partition 2> /dev/null`" ] ; then

trunk/mondo/mondo/common/mondostructures.h

@@ -460 +460 @@
    * If you do nothing, "/" will be used.
    */
-    char include_paths[MAX_STR_LEN];
+    char include_paths[MAX_STR_LEN*4];
 
   /**
@@ -467 +467 @@
    * the scratchdir, and the tempdir are automatically excluded.
    */
-    char exclude_paths[MAX_STR_LEN];
+    char exclude_paths[MAX_STR_LEN*4];
 
   /**

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

@@ -225 +225 @@
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
-                 */// -b images/mindi-boot.2880.img
+     */// -b images/mindi-boot.2880.img
 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
-                 */// -b images/mindi-boot.2880.img
+     */// -b images/mindi-boot.2880.img
 #define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 

trunk/tools/livwww

@@ -16 +16 @@
 TESTDIR=/mondo/www/html/test
 
-force=0
+force=1
 nodoc=0
 
-if [ "$1" = "-f" ]; then
-        force=1
+if [ "$1" = "--keep" ]; then
+        force=0
         optsvn=""
         shift
@@ -35 +35 @@
     DESTMACH=mondo.hpintelco.org
 else
-    DESTMACH=www1.mondorescue.org
+    DESTMACH=www.mondorescue.org
 fi