From 46c0123b4cd853adc15730654c120769f23ef206 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 22 Jun 2007 22:00:27 +0000 Subject: - init.d/network: add support for VLAN_PLUS_VID_NO_PAD vlans (#222975) --- initscripts.spec | 2 ++ rc.d/init.d/network | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index aa69053e..5afb4c10 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -207,6 +207,8 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +- init.d/network: add support for VLAN_PLUS_VID_NO_PAD vlans (#222975) + * Mon Feb 12 2007 Miloslav Trmac - 7.93.29.EL-1 - Revert a backport of UTF-8 support for console keymaps Related: #150769 diff --git a/rc.d/init.d/network b/rc.d/init.d/network index e2060ae0..89b82381 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -121,7 +121,7 @@ case "$1" in continue fi - if [ "${DEVICE%%.*}" != "$DEVICE" ] ; then + if [ "${DEVICE%%.*}" != "$DEVICE" -o "${DEVICE##vlan}" != "$DEVICE" ] ; then vlaninterfaces="$vlaninterfaces $i" unset DEVICE TYPE SLAVE BRIDGE continue @@ -230,7 +230,7 @@ case "$1" in continue fi - if [ "${DEVICE%%.*}" != "$DEVICE" ] ; then + if [ "${DEVICE%%.*}" != "$DEVICE" -o "${DEVICE##vlan}" != "$DEVICE" ] ; then vlaninterfaces="$vlaninterfaces $i" unset DEVICE TYPE SLAVE BRIDGE continue -- cgit