Changeset 1529


Ignore:
Timestamp:
Jul 6, 2007, 2:28:03 PM (12 years ago)
Author:
bruno
Message:
  • ChangeLogs? updated for upcoming 2.2.4
  • Attempt to fix #177 by removing first headers and repodata directory before regenerating them.
  • Fix a problem in directory link handling in mindi (seen on gentoo 64) with the precious help of Francesco Talamona ti.liame_at_email.it
  • Gentoo ebuild are now unmasked on my side
  • usb-storage instead of usb_storage as a module name for Virtual CD support seems better
  • Document support for Proliant Virtual Media with mindi
  • Mandriva packages go first to contrib/testing not backport
  • Size of DVD is 4482 (or more surely 4480 to avoid problems). Fixed everywhere.
  • Fix a bug in Mandriva official package creation

(merge -r1519:1528 $SVN_M/branches/2.2.4)

Location:
branches/stable
Files:
15 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/stable/contrib/mkcd/setup

    r911 r1529  
    146146
    147147    if uname -a | grep Knoppix > /dev/null ; then
    148     echo "Knoppix LiveCD"
    149     return
     148        echo "Knoppix LiveCD"
     149        return
    150150    fi
    151151
     
    156156    fi
    157157
    158     for fname in `find /etc -maxdepth 1 | grep release` /etc/issue.net ; do
     158    for fname in `find /etc -maxdepth 1 | grep -E 'release|issue'` ; do
    159159        res=`cat $fname 2>/dev/null | grep -i "linux" | head -n1 | tr -s '\t' ' '`
    160160        [ "$res" = "" ] && res=`cat $fname |head -n1 | tr -s '\t' ' '`
  • branches/stable/mindi-busybox/distributions/gentoo/mindi-busybox.ebuild

    r1445 r1529  
    1010LICENSE="GPL-2"
    1111SLOT="0"
    12 KEYWORDS="~x86 ia64 -*"
     12KEYWORDS="x86 ia64 -*"
    1313DEPEND="virtual/libc"
    1414RDEPEND=">=app-arch/bzip2-0.9
  • branches/stable/mindi/ChangeLog

    r1500 r1529  
    33MINDI CHANGES
    44
    5 1.2.4 (2007-06-09)
     51.2.4 (2007-07-06)
     6- Fix a problem in directory link handling in mindi seen on gentoo64 (Francesco Talamona/Bruno Cornec)
     7- Add README.proliant to document Virtual Media usage (Bruno Cornec)
     8- Add support for megaraid_sas (Daniel Hill/Bruno Cornec)
     9- No more acpi=off by default during restore (Bruno Cornec)
     10- /var/cache/mindi now useed by default for mindi images (Bruno Cornec)
     11- Add support for LSI SAS1064E (Brandon Poyner/Bruno Cornec)
     12- Fix a bug on the MODULE variable and grep -F usage with spaces. (Bruno Cornec)
     13- Fix Virtual media usage (Patrick Albert)
    614- Improve VMWare ESX support (Bruno Cornec)
    715- Fix a x86_64 bug (Bruno Cornec)
  • branches/stable/mindi/README.proliant

    r1524 r1529  
    33- Edit your /usr/sbin/mindi script
    44- Look for declaration of the variable FORCE_MODS.
    5 - Change it to FORCE_MODS="usb_storage sr_mod"
     5- Change it to FORCE_MODS="usb-storage sr_mod"
    66
    77On 3.x.y version:
    88- Edit your /etc/mindi/mindi.conf configuration file
    99- Look for declaration of the variable mindi_force_mods
    10 - Change it to mindi_force_mods="usb_storage sr_mod"
     10- Change it to mindi_force_mods="usb-storage sr_mod"
    1111
    1212Those drivers will then be available at restore time, and your virtual media thus detected and supported.
  • branches/stable/mindi/distributions/gentoo/mindi.ebuild

    r1513 r1529  
    1111LICENSE="GPL-2"
    1212SLOT="0"
    13 KEYWORDS="~x86 -*"
     13KEYWORDS="x86 ia64 -*"
    1414IUSE=""
    1515
  • branches/stable/mindi/mindi

    r1508 r1529  
    301301
    302302CopyDependenciesToDirectory() {
    303     local outdir incoming fname filesize counter
     303    local outdir incoming fname filesize counter d found
    304304    outdir=$1
    305305    mkdir -p $outdir
     
    307307    counter=0
    308308    while [ "$incoming" != "" ] ; do
    309         if [ -d "$incoming" ] ; then
     309        # Non absolute file names should not arrive till here => skipped
     310        if [ `echo "$incoming" | cut -c1` != '/' ]; then
     311            LogIt "Unable to handle $incoming"
     312            incoming=`ReadLine`
     313            continue
     314        fi
     315        # no parent directory of incoming should be a link, copy is not possible in that case
     316        d=`dirname "$incoming"`
     317        found="false"
     318        while [ $d != "/" -a $found = "false" ]; do
     319            [ -h "$d" ] && found="true"
     320            d=`dirname "$d"`
     321        done
     322        if [ -d "$incoming" ] && [ ! -h "$incoming" ]; then
    310323            find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
    311         elif [ -e "$incoming" ] ; then
     324        elif [ -e "$incoming" ] && [ $found = "false" ]; then
    312325            filesize=`du -sk $incoming | cut -f1`
    313326            if [ "$filesize" -gt "$(($CHOPSIZE*2))" ] && [ ! -h "$incoming" ] ; then
     
    9941007            echo "$fname is softlink" >> $LOGFILE
    9951008        else
    996             ldd $fname 2> /dev/null | ProcessLDD $fname
     1009            ldd $fname 2> /dev/null | ProcessLDD
    9971010        fi
    9981011    done
     
    10251038    local i path fname_to_find location output resolved tmp stub cache_id loclist
    10261039    fname_to_find="$1"
     1040    # It's an absolute path
    10271041    if echo "$fname_to_find" | grep -x "/.*" ; then
    10281042        output="$fname_to_find"
     
    10331047        return 0
    10341048    fi
     1049    # It's not an absolute path
    10351050    output=""
    1036     for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
    1037         [ ! -d "$path" ] && continue
    1038         for location in "$path/$fname_to_find" ; do
    1039             [ ! -e "$location" ] && continue
    1040             output="$location $output"
    1041             if [ -h "$location" ] ; then
    1042                 output="`ReadAllLink $location` $output"
    1043             fi
    1044         done
     1051    for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin `find /usr/lib /lib /usr/local/lib /usr/X11R6/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d -maxdepth 1 2> /dev/null` ; do
     1052    #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
     1053        [ -h "$path" ] && continue
     1054        [ ! -e "$path/$fname_to_find" ] && continue
     1055        output="$path/$fname_to_find $output"
     1056        if [ -h "$path/$fname_to_find" ] ; then
     1057            output="`ReadAllLink $path/$fname_to_find` $output"
     1058        fi
    10451059    done
    10461060    if [ "$output" = "" ] ; then
     
    23142328
    23152329ProcessLDD() {
    2316     local main_fname incoming j i fname f newf
    2317     main_fname=$1
     2330    local incoming f
    23182331    read incoming
    23192332    while [ "$incoming" != "" ] ; do
    23202333        # We take the full path name of the dyn. lib. we want
    2321         incoming=`echo "$incoming" | sed '/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*(.*/d ; s/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*\(\/.*\)/\1/ ; s/[[:blank:]]*\(\/.*\)[[:blank:]]*(.*/\1/'`
    2322         for f in `echo "$incoming"` ; do
     2334        incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
     2335        for f in $incoming ; do
    23232336            echo "$f `ReadAllLink $f`"
    23242337        done
  • branches/stable/mondo-doc/distributions/conf/mondorescue.conf

    r541 r1529  
    4040# Default size of media
    4141#
    42 # Use 4380 for DVDs, 650 or 700 for CDs
     42# Use 4480 for DVDs, 650 or 700 for CDs
    4343#
    44 media_size=4380
     44media_size=4480
    4545
    4646#
  • branches/stable/mondo/ChangeLog

    r1500 r1529  
    33MONDO CHANGES
    44
    5 2.2.4 (2007-06-09)
     52.2.4 (2007-07-06)
     6- Size of DVD is 4482 (or more surely 4480 to avoid problems - used everywhere) (Bruno Cornec)
     7- New Hardware migration guide with P2V (Eric Montaut/Gallig/Renaud/Bruno Cornec)
     8- Fix a memory allocation bug where strings were freed to early (Nick Hajek)
     9- yum support added to ftp server (Mark Nienberg/Bruno Cornec)
     10- Also computes number of media for NFS backups (Patrick Albert/Bruno Cornec)
     11- Improve message around ISO directory (Patrick Albert/Bryan Gartner)
    612- Improved Ubuntu support (Fix #159) (Bruno Cornec)
    713- Improved VMWare ESX supoprt (Amaury Tanquerel/Bruno Cornec)
  • branches/stable/mondo/distributions/conf/mondo.conf.dist

    r1434 r1529  
    4343# Use 4380 for DVDs, 650 or 700 for CDs
    4444#
    45 mondo_media_size=4380
     45mondo_media_size=4480
    4646
    4747#
  • branches/stable/mondo/distributions/gentoo/mondo.ebuild

    r1513 r1529  
    1313LICENSE="GPL-2"
    1414SLOT="0"
    15 KEYWORDS="-* ~x86"
     15KEYWORDS="x86 ia64 -*"
    1616IUSE=""
    1717
  • branches/stable/mondo/src/common/libmondo-devices.c

    r1514 r1529  
    14941494                find_dvd_device(bkpinfo->media_device, FALSE);
    14951495                mr_asprintf(&tmp, "1");
    1496                 mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
     1496                mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
    14971497                mr_msg(1, "Setting to DVD defaults");
    14981498            } else if (bkpinfo->backup_media_type == usb) {
  • branches/stable/mondo/src/include/my-stuff.h

    r1458 r1529  
    337337#define log_it(format, args...) mr_msg(2, format, ## args)
    338338
    339 #define DEFAULT_DVD_DISK_SIZE 4380  ///< The default size (in MB) of a DVD disk, unless the user says otherwise.
     339#define DEFAULT_DVD_DISK_SIZE 4480  ///< The default size (in MB) of a DVD disk, unless the user says otherwise.
    340340
    341341#define DEFAULT_DEBUG_LEVEL 4   ///< By default, don't log messages with a loglevel higher than this.
  • branches/stable/mondo/src/mondoarchive/mondo-cli.c

    r1434 r1529  
    432432        }
    433433        if (!flag_set['s']) {
    434             sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
     434            sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4482 MB
    435435            strcat(flag_val['s'], "m");
    436436            log_to_screen
  • branches/stable/tools/pkg2ftp

    r1442 r1529  
    9595        scp -p $MONDOTMP/${ddir}-mondo.repo ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
    9696        # Build a yum repository
    97         ssh -q ${ACCOUNT} "cd ${DSTDIR}/${ddir}/${dver} ; yum-arch . ; createrepo ."
     97        ssh -q ${ACCOUNT} "cd ${DSTDIR}/${ddir}/${dver} ; rm -rf headers/ repodata/ ; yum-arch . ; createrepo ."
    9898    fi
    9999fi
  • branches/stable/tools/pkg2mdv

    r1386 r1529  
    7676    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $TAG/" SPECS/$p.spec
    7777    perl -pi -e "s/^Release:/Packager:  Bruno Cornec <bcornec\@mandriva.org>\nRelease:/" SPECS/$p.spec
    78     perl -pi -e 's/mindi >= ..*,/mindi/' SPECS/$p.spec
     78    perl -pi -e 's/mindi >= [0-9.]*,/mindi/' SPECS/$p.spec
    7979    $TOOLHOME/mdv-changelog.pl SPECS/$p.spec
    8080    # Changelog management
     
    9292            repsys submit svn+ssh://svn.mandriva.com/svn/packages/cooker/$p $rev
    9393            for t in 2007.0 2007.1; do
    94                 repsys submit -t $t --define section=contrib/backports svn+ssh://svn.mandriva.com/svn/packages/cooker/$p $rev
     94                repsys submit -t $t --define section=contrib/testing svn+ssh://svn.mandriva.com/svn/packages/cooker/$p $rev
    9595            done
    9696        fi
  • branches/stable/tools/qemu-vm.txt

    r1513 r1529  
    1515# gentoo
    1616#Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
    17 emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs
     17emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue sudo # cdrecord mkisofs
    1818
    1919# Slackware
Note: See TracChangeset for help on using the changeset viewer.