network: don't use "ifup -m"
"ifup -m" was thought to be used by humans in the emergency shell. Using it programatically shows some other flaw in the execution logic. Also, "ifup -m" was configuring the interface multiple times on "add" and "change" uevent, because the "$netif.did-setup" test was not executed.master
parent
0f89ec314b
commit
7cca5efdce
|
@ -77,9 +77,10 @@ fi
|
|||
# disable manual ifup while netroot is set for simplifying our logic
|
||||
# in netroot case we prefer netroot to bringup $netif automaticlly
|
||||
[ -n "$2" -a "$2" = "-m" ] && [ -z "$netroot" ] && manualup="$2"
|
||||
[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
|
||||
|
||||
if [ -n "$manualup" ]; then
|
||||
>/tmp/net.$netif.manualup
|
||||
rm -f /tmp/net.${netif}.did-setup
|
||||
else
|
||||
[ -e /tmp/net.${netif}.did-setup ] && exit 0
|
||||
[ -e /sys/class/net/$netif/address ] && \
|
||||
|
|
|
@ -50,7 +50,6 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
|
|||
fi
|
||||
|
||||
ifup='/sbin/ifup $env{INTERFACE}'
|
||||
[ -z "$netroot" ] && ifup="$ifup -m"
|
||||
|
||||
runcmd="RUN+=\"/sbin/initqueue --name ifup-\$env{INTERFACE} --unique --onetime $ifup\""
|
||||
|
||||
|
|
Loading…
Reference in New Issue