File sysconfig-network-remotefs-virtual-order.bnc447098.diff of Package sysconfig
--- scripts/functions
+++ scripts/functions 2008/11/26 20:41:00
@@ -127,6 +127,7 @@ get_ethtool_drv_info () {
if [ ! -x $ethtool ] ; then
[ -x /usr${ethtool} ] && ethtool="/usr${ethtool}" || return 1
fi
+ local key val
$ethtool -i "$IF" 2>/dev/null |
while read key val ; do
case "$key" in
@@ -150,7 +151,7 @@ get_iface_type () {
test -f /proc/net/vlan/$IF && TYPE=vlan
test -d /sys/class/net/$IF/bonding && TYPE=bond
test -d /sys/devices/virtual/net/$IF && {
- eval local `get_ethtool_drv_info $IF`
+ eval local x `get_ethtool_drv_info $IF`
test "$ETHTOOL_DRV_NAME" == "tun" && \
TYPE="$ETHTOOL_DRV_BUS_INFO" || \
case $IF in tap*) TYPE=tap ;; esac
--- scripts/network
+++ scripts/network 2008/11/26 20:43:19
@@ -593,6 +593,9 @@ if test "x$FS_FILTER" != x ; then
$ALL_MANDATORY_SLAVES
ALL_VIRTUAL_IFACES=$VIRTUAL_IFACES
+ resolve_iface_startorder ALL_VIRTUAL_IFACES \
+ "$ALL_VIRTUAL_IFACES" \
+ "$PHYSICAL_IFACES $MANDATORY_DEVICES $MANDATORY_SLAVES"
resolve_iface_startorder LFS_VIRTUAL_IFACES \
"$ALL_VIRTUAL_IFACES" \
"$LFS_PHYSICAL_IFACES $LFS_MANDATORY_DEVICES $LFS_MANDATORY_SLAVES" \
@@ -607,7 +610,7 @@ if test "x$FS_FILTER" != x ; then
debug "* Modifications by $FS_FILTER filter:"
debug "PHYSICAL_IFACES => $LFS_PHYSICAL_IFACES + $RFS_PHYSICAL_IFACES = $ALL_PHYSICAL_IFACES"
debug "NOT_PHYSICAL_IFACES => $LFS_NOT_PHYSICAL_IFACES + $RFS_NOT_PHYSICAL_IFACES = $ALL_NOT_PHYSICAL_IFACES"
- debug "MANDATORY_DEVICES => $LFS_MANDATORY_DEVICES + $RFS_MANDATORY_DEVICES = ALL_MANDATORY_DEVICES"
+ debug "MANDATORY_DEVICES => $LFS_MANDATORY_DEVICES + $RFS_MANDATORY_DEVICES = $ALL_MANDATORY_DEVICES"
debug "MANDATORY_SLAVES => $LFS_MANDATORY_SLAVES + $RFS_MANDATORY_SLAVES = $ALL_MANDATORY_SLAVES"
debug "VIRTUAL_IFACES => $LFS_VIRTUAL_IFACES + $RFS_VIRTUAL_IFACES = $ALL_VIRTUAL_IFACES"