Changeset 518 for trunk


Ignore:
Timestamp:
May 1, 2006, 1:42:39 AM (13 years ago)
Author:
bcornec
Message:

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

Location:
trunk
Files:
2 deleted
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/documentation/Makefile.howto

    r507 r518  
    3434    @rm -fr $(TARGET)
    3535    @docbook2html -d $(TARGET).dsl'#html' -o $(TARGET) $(TARGET).sgml
    36     @ln -sf $(IMAGESDIR) $(TARGET)
     36    @(cd $(TARGET) ; ln -sf ../$(IMAGESDIR) .)
    3737
    3838$(TARGET).html: $(SRC) $(DSL) $(IMAGES)
  • trunk/mindi/mindi

    r512 r518  
    132132CDROM_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"
    133133NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
    134 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"
     134EXTRA_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"
    135135LOGFILE=/var/log/mindi.log
    136136
     
    13821382    [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
    13831383    if [ -h "$c_p" ] && [ "`echo "$c_p" | fgrep "/dev/hd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/sd"`" = "" ] && [ "`echo "$c_p" | fgrep "/dev/md"`" = "" ] ; then
    1384             current_partition=`ResolveSoftlink $c_p`
     1384        current_partition=`ResolveSoftlink $c_p`
    13851385        [ "`echo "$current_partition" | fgrep "/dev/mapper"`" != "" ] && current_partition="$c_p"
    1386             [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
     1386        [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | fgrep "$current_partition"`" ] && continue
    13871387    else
    13881388        current_partition="$c_p"
    13891389    fi
    13901390    [ "$c_p" = "none" ] && continue
    1391         absolute_partition=`ResolveSoftlink $c_p`
     1391    absolute_partition=`ResolveSoftlink $c_p`
    13921392    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     1393
     1394    # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
     1395    # current_partition contains only first column of /etc/fstab
    13931396    redhat_label=""
    1394     if [ "`echo "$current_partition" | fgrep -i "LABEL=SWAP"`" != "" ] ; then
    1395             redhat_label=`echo "$current_partition" | cut -d'=' -f2`
    1396             actual_dev="/dev/`echo "$redhat_label" | cut -d '-' -f2`"
    1397             current_partition=$actual_dev
    1398     elif [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
     1397    if [ "`echo "$current_partition" | /bin/grep -f -i "LABEL="`" != "" ] ; then
    13991398        str_to_find_fmt_with=$current_partition
    1400         redhat_label=`echo "$current_partition" | cut -d'=' -f2`
    1401         actual_dev=`mount -l | fgrep " [$redhat_label]" | cut -d' ' -f1`
    1402 #       partition_mountpt=$redhat_label
    1403         current_partition=$actual_dev
     1399        redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
     1400        actual_dev=""
     1401
     1402        # 1st try : blkid, the good way
     1403        if [ -x "/sbin/blkid" ] ; then
     1404            actual_dev=`/sbin/blkid | grep "$current_partition" | /bin/cut -d':' -f1`
     1405        fi
     1406        # 2nd try, which works on a standard partition (ext2/3), but not on swap
     1407        if [ $actual_dev="" ] ; then
     1408            actual_dev=`/bin/mount -l | /bin/grep " [$redhat_label]" | /bin/cut -d' ' -f1`
     1409        fi
     1410        # 3rd try, with vol_id (which works with swap)
     1411        if [ $actual_dev="" -a -x "/sbin/vol_id" ] ; then
     1412                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
     1413                for dev_swap in $list_swaps ; do
     1414                    dev_exists=`/sbin/vol_id $dev_swap | /bin/grep -f "$redhat_label"`
     1415                    if [ -n "$dev_exists" ] ; then
     1416                        actual_dev=$dev_swap
     1417                        break;
     1418                    fi
     1419                done
     1420        fi
     1421        # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
     1422        if [ $actual_dev="" -a  "`echo "$current_partition" | /bin/grep -f -i "LABEL=SWAP"`" != ""] ; then
     1423                actual_dev="/dev/`echo "$redhat_label" | /bin/cut -d '-' -f2`"
     1424        fi
     1425        # Check if one of all those tries has known success
     1426        if [  $actual_dev != "" ] ; then
     1427                current_partition=$actual_dev
     1428        else
     1429            Die "Your system uses a labelled swap partition, but you lack the tool to su
     1430pport it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
     1431        fi
    14041432    else
    14051433        str_to_find_fmt_with=$current_partition
    14061434    fi
     1435
    14071436    partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
    14081437    if [ -d "/proc/lvm" ] && [ "`lvdisplay $current_partition 2> /dev/null`" ] ; then
  • trunk/mondo/mondo/common/mondostructures.h

    r300 r518  
    460460   * If you do nothing, "/" will be used.
    461461   */
    462     char include_paths[MAX_STR_LEN];
     462    char include_paths[MAX_STR_LEN*4];
    463463
    464464  /**
     
    467467   * the scratchdir, and the tempdir are automatically excluded.
    468468   */
    469     char exclude_paths[MAX_STR_LEN];
     469    char exclude_paths[MAX_STR_LEN*4];
    470470
    471471  /**
  • trunk/mondo/mondo/common/my-stuff.h

    r512 r518  
    225225/**
    226226 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    227                 */// -b images/mindi-boot.2880.img
     227    */// -b images/mindi-boot.2880.img
    228228#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"
    229229
    230230/**
    231231 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    232                 */// -b images/mindi-boot.2880.img
     232    */// -b images/mindi-boot.2880.img
    233233#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"
    234234
  • trunk/tools/livwww

    r448 r518  
    1616TESTDIR=/mondo/www/html/test
    1717
    18 force=0
     18force=1
    1919nodoc=0
    2020
    21 if [ "$1" = "-f" ]; then
    22         force=1
     21if [ "$1" = "--keep" ]; then
     22        force=0
    2323        optsvn=""
    2424        shift
     
    3535    DESTMACH=mondo.hpintelco.org
    3636else
    37     DESTMACH=www1.mondorescue.org
     37    DESTMACH=www.mondorescue.org
    3838fi
    3939
Note: See TracChangeset for help on using the changeset viewer.