From 7ed132f392bf35527b9e2a0de18fa99c75a2f414 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 22 Jun 2007 21:10:30 +0000 Subject: - add support for VLAN_PLUS_VID_NO_PAD vlans (#229285) --- initscripts.spec | 8 +++----- rc.d/init.d/network | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index e87b81a0..826b8fae 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.45.15.EL +Version: 8.45.16.EL License: GPL Group: System Environment/Base Release: 1 @@ -195,10 +195,8 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog -* Thu Jan 18 2007 Peter Jones 8.45.15.EL-1 -- copy dhclient lease files from the initrd into /var/lib/dhclient so - the network doesn't get reset during startup with iscsi / - Resolves: #218791 +* Fri Jun 22 2007 Bill Nottingham 8.45.16.EL-1 +- add support for VLAN_PLUS_VID_NO_PAD vlans (#229285) * Mon Jan 15 2007 Bill Nottingham 8.45.14.EL-1 - set MACADDR, if specified, before bringing up bonding master/slaves (#218792) diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 29a09940..c49928c2 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -114,7 +114,7 @@ case "$1" in continue fi - if [ "${DEVICE%%.*}" != "$DEVICE" ] ; then + if [ "${DEVICE%%.*}" != "$DEVICE" -o "${DEVICE##vlan}" != "$DEVICE" ] ; then vlaninterfaces="$vlaninterfaces $i" continue fi @@ -223,7 +223,7 @@ case "$1" in continue fi - if [ "${DEVICE%%.*}" != "$DEVICE" ] ; then + if [ "${DEVICE%%.*}" != "$DEVICE" -o "${DEVICE##vlan}" != "$DEVICE" ] ; then vlaninterfaces="$vlaninterfaces $i" continue fi -- cgit