# check, if we need VLAN's for this interface
if [ -z "$DO_VLAN_PHY" ] && [ -e /tmp/vlan.${netif}.phy ]; then
+ unset DO_VLAN
NO_AUTO_DHCP=yes DO_VLAN_PHY=yes ifup "$netif"
modprobe -b -q 8021q
exit 0
fi
+# Check, if interface is VLAN interface
+if ! [ -e /tmp/vlan.${netif}.phy ]; then
+ for i in /tmp/vlan.${netif}.*; do
+ [ -e "$i" ] || continue
+ export DO_VLAN=yes
+ break
+ done
+fi
+
+
# bridge this interface?
if [ -z "$NO_BRIDGE_MASTER" ]; then
for i in /tmp/bridge.*.info; do
rm -f /tmp/net.${netif}.did-setup
else
[ -e /tmp/net.${netif}.did-setup ] && exit 0
+ [ -z "$DO_VLAN" ] && \
[ -e /sys/class/net/$netif/address ] && \
[ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0
fi
if [ $ret -eq 0 ]; then
> /tmp/net.${netif}.up
- if [ -e /sys/class/net/${netif}/address ]; then
+ if [ -z "$DO_VLAN" ] && [ -e /sys/class/net/${netif}/address ]; then
> /tmp/net.$(cat /sys/class/net/${netif}/address).up
fi
ip addr flush dev $netif
echo "#empty" > /etc/resolv.conf
rm -f -- /tmp/net.$netif.did-setup
- [ -e /sys/class/net/$netif/address ] && \
+ [ -z "$DO_VLAN" ] && \
+ [ -e /sys/class/net/$netif/address ] && \
rm -f -- /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
# TODO: send "offline" uevent?
}
local netif="$1" f="" gw_ip="" netroot_ip="" iface="" IFACES=""
local _p
[ -e /tmp/net.$netif.did-setup ] && return
- [ -e /sys/class/net/$netif/address ] && \
+ [ -z "$DO_VLAN" ] && \
+ [ -e /sys/class/net/$netif/address ] && \
[ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && return
[ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
[ -z "$IFACES" ] && IFACES="$netif"
unset layer2
> /tmp/net.$netif.did-setup
- [ -e /sys/class/net/$netif/address ] && \
+ [ -z "$DO_VLAN" ] && \
+ [ -e /sys/class/net/$netif/address ] && \
> /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
}
unset vlanname
unset phydevice
if [ ! "$vlan" = "vlan" ]; then
- parsevlan "$(getarg vlan=)"
+ parsevlan "$vlan"
fi
echo "phydevice=\"$phydevice\"" > /tmp/vlan.${phydevice}.phy
{
echo "# Generated by dracut initrd"
echo "NAME=\"$netif\""
- interface_bind "$netif" "$macaddr"
+ [ -z "$vlan" ] && interface_bind "$netif" "$macaddr"
echo "ONBOOT=yes"
echo "NETBOOT=yes"
echo "UUID=\"$uuid\""