Changeset 890


Ignore:
Timestamp:
Oct 10, 2006, 10:34:13 AM (13 years ago)
Author:
bruno
Message:
  • mondo depends on mindi > 1.2.0 now
  • As I redeliver I also fix a remaining bug for bonding
Location:
branches/2.2.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.0/mondo/distributions/rpm/mondo.spec

    r825 r890  
    1919ExcludeArch:    ppc
    2020OBS
    21 Requires:   mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
     21Requires:   mindi >= 1.2.0, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
    2222%ifarch ia64
    2323Requires:   elilo, parted
  • branches/2.2.0/mondo/mondo/common/libmondo-files.c

    r879 r890  
    12851285        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
    12861286        sprintf(command,
    1287                 "ifconfig %s | awk '{print $5}'", nfs_dev);
     1287                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
    12881288        strcpy(mac_addr, call_program_and_get_last_line_of_output(command));
    12891289        sprintf(command,
    1290                 "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev );
     1290                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
    12911291        strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
    12921292        log_to_screen("Replacing it with %s\n", nfs_dev);
  • branches/2.2.0/tools/build2pkg

    r887 r890  
    8383            status=-1
    8484        else
    85             export pkg1="`egrep '^Wrote:' $log | grep -v debuginfo | cut -d: -f2`"
     85            export pkg1="`egrep '^Wrote:' $log | grep -v debug | cut -d: -f2`"
    8686            if [ -f /usr/bin/rpmlint ]; then
    8787                /usr/bin/rpmlint $pkg1
Note: See TracChangeset for help on using the changeset viewer.