Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/busybox/patches/busybox-1.30.1-fix-ip-online-a.patch

    Contents of /trunk/busybox/patches/busybox-1.30.1-fix-ip-online-a.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3320 - (show annotations) (download)
    Thu Mar 14 14:14:42 2019 UTC (5 years, 1 month ago) by niro
    File size: 1034 byte(s) 
    -added inline patch from upstream to revert this patch as it breaks 'ip -o link show dev [iface]', which ends up in empty lines
    1 From db169f253854db572c0c2b7e3d74ebbe6afdb97f Mon Sep 17 00:00:00 2001
    2 From: Denys Vlasenko <vda.linux@googlemail.com>
    3 Date: Thu, 8 Mar 2018 15:55:07 +0100
    4 Subject: ip: fix "ip -oneline a"
    5
    6 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
    7 ---
    8 networking/libiproute/ipaddress.c | 5 ++++-
    9 1 file changed, 4 insertions(+), 1 deletion(-)
    10
    11 (limited to 'networking/libiproute')
    12
    13 diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
    14 index d7f888176..9ec665b69 100644
    15 --- a/networking/libiproute/ipaddress.c
    16 +++ b/networking/libiproute/ipaddress.c
    17 @@ -570,7 +570,10 @@ int FAST_FUNC ipaddr_list_or_flush(char **argv, int flush)
    18 }
    19
    20 for (l = linfo; l; l = l->next) {
    21 - if (no_link || print_linkinfo(&l->h) == 0) {
    22 + if (no_link
    23 + || (oneline || print_linkinfo(&l->h) == 0)
    24 + /* ^^^^^^^^^ "ip -oneline a" does not print link info */
    25 + ) {
    26 struct ifinfomsg *ifi = NLMSG_DATA(&l->h);
    27 if (G_filter.family != AF_PACKET)
    28 print_selected_addrinfo(ifi->ifi_index, ainfo);
    29 --
    30 cgit v1.2.1
    31