Ignore:
Timestamp:
Oct 25, 2006, 1:49:52 AM (14 years ago)
Author:
Bruno Cornec
Message:

merge -r862:888 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/common/libmondo-files.c

    r900 r903  
    11091109        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
    11101110        mr_asprintf(&command,
    1111                 "ifconfig %s | awk '{print $5}'", nfs_dev);
     1111                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
    11121112        mac_addr = call_program_and_get_last_line_of_output(command);
    11131113        mr_asprintf(&command,
    1114                 "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
     1114                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr);
    11151115        mr_free(nfs_dev);
    11161116        nfs_dev = call_program_and_get_last_line_of_output(command);
Note: See TracChangeset for help on using the changeset viewer.