View | Details | Raw Unified | Return to bug 1165547
Collapse All | Expand All

(-)file_not_specified_in_diff (-4 / +10 lines)
Line  Link Here
0
-- 35network-legacy/ifup.sh    2020-03-03 13:03:16.526084613 +0100
0
++ /usr/lib/dracut/modules.d/35network-legacy/ifup.sh  2020-03-03 13:07:03.960015452 +0100
Lines 76-87 Link Here
76
    if [ ! -s /tmp/net.$netif.resolv.conf.ipv${1:1:1} ]; then
76
    if [ ! -s /tmp/net.$netif.resolv.conf.ipv${1:1:1} ]; then
77
        if [ -n "${DNSDOMAIN}" ]; then
77
        if [ -n "${DNSDOMAIN}" ]; then
78
            echo domain "${DNSDOMAIN}"
78
            echo domain "${DNSDOMAIN}"
79
        fi >> /tmp/net.$netif.resolv.conf.ipv${1:1:1}
79
        fi
80
80
81
        if [ -n "${DNSSEARCH}" ]; then
81
        if [ -n "${DNSSEARCH}" ]; then
82
            echo search "${DNSSEARCH}"
82
            echo search "${DNSSEARCH}"
83
        fi >> /tmp/net.$netif.resolv.conf.ipv${1:1:1}
83
        fi 
84
    fi
84
85
        if  [ -n "${DNSSERVERS}" ] ; then
86
        for s in ${DNSSERVERS}; do
87
            echo nameserver "$s"
88
        done 
89
        fi
90
    fi  >> /tmp/net.$netif.resolv.conf.ipv${1:1:1}
85
    # copy resolv.conf if it doesn't exist yet, modify otherwise
91
    # copy resolv.conf if it doesn't exist yet, modify otherwise
86
    if [ -e /tmp/net.$netif.resolv.conf.ipv${1:1:1} ] && [ ! -e /etc/resolv.conf ]; then
92
    if [ -e /tmp/net.$netif.resolv.conf.ipv${1:1:1} ] && [ ! -e /etc/resolv.conf ]; then
87
        cp -f /tmp/net.$netif.resolv.conf.ipv${1:1:1} /etc/resolv.conf
93
        cp -f /tmp/net.$netif.resolv.conf.ipv${1:1:1} /etc/resolv.conf

Return to bug 1165547