From mboxrd@z Thu Jan 1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] Remove old VLAN initscript
Date: Wed, 05 Aug 2015 12:45:21 +0100
Message-ID: <1438775121-14063-2-git-send-email-michael.tremer@ipfire.org>
In-Reply-To: <1438775121-14063-1-git-send-email-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7101025125156950165=="
List-Id: <development.lists.ipfire.org>
--===============7101025125156950165==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/common/armv5tel/initscripts | 2 -
config/rootfiles/common/i586/initscripts | 2 -
lfs/initscripts | 1 -
src/initscripts/init.d/network-vlans | 113 -------------------------=
--
4 files changed, 118 deletions(-)
delete mode 100644 src/initscripts/init.d/network-vlans
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/=
common/armv5tel/initscripts
index b4cd8f8..a174c5b 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -62,7 +62,6 @@ etc/rc.d/init.d/mounttmpfs
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
-etc/rc.d/init.d/network-vlans
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -232,7 +231,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S90network-trigger
-etc/rc.d/rcsysinit.d/S91network-vlans
etc/rc.d/rcsysinit.d/S92rngd
etc/rc.d/rc3.d/S15fireinfo
#etc/sysconfig
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/comm=
on/i586/initscripts
index 878ba66..84c432a 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -64,7 +64,6 @@ etc/rc.d/init.d/mounttmpfs
#etc/rc.d/init.d/netsnmpd
etc/rc.d/init.d/network
etc/rc.d/init.d/network-trigger
-etc/rc.d/init.d/network-vlans
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
@@ -237,7 +236,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup
etc/rc.d/rcsysinit.d/S80localnet
etc/rc.d/rcsysinit.d/S85firewall
etc/rc.d/rcsysinit.d/S90network-trigger
-etc/rc.d/rcsysinit.d/S91network-vlans
etc/rc.d/rcsysinit.d/S92rngd
etc/rc.d/rc3.d/S15fireinfo
#etc/sysconfig
diff --git a/lfs/initscripts b/lfs/initscripts
index 4005941..141fd66 100755
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -177,7 +177,6 @@ $(TARGET) :
ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet
ln -sf ../init.d/firewall /etc/rc.d/rcsysinit.d/S85firewall
ln -sf ../init.d/network-trigger /etc/rc.d/rcsysinit.d/S90network-trigger
- ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans
ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S92rngd
ln -sf ../init.d/wlanclient /etc/rc.d/rc0.d/K82wlanclient
ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient
diff --git a/src/initscripts/init.d/network-vlans b/src/initscripts/init.d/ne=
twork-vlans
deleted file mode 100644
index a6a75c3..0000000
--- a/src/initscripts/init.d/network-vlans
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2012 IPFire Team <info(a)ipfire.org> =
#
-# #
-############################################################################
-
-CONFIG_FILE=3D"/var/ipfire/ethernet/vlans"
-
-# Skip immediately if no configuration file has been found.
-[ -e "${CONFIG_FILE}" ] || exit 0
-
-eval $(/usr/local/bin/readhash ${CONFIG_FILE})
-
-# This is start or stop.
-action=3D${1}
-
-for interface in green0 red0 blue0 orange0; do
- case "${interface}" in
- green*)
- PARENT_DEV=3D${GREEN_PARENT_DEV}
- VLAN_ID=3D${GREEN_VLAN_ID}
- MAC_ADDRESS=3D${GREEN_MAC_ADDRESS}
- ;;
- red*)
- PARENT_DEV=3D${RED_PARENT_DEV}
- VLAN_ID=3D${RED_VLAN_ID}
- MAC_ADDRESS=3D${RED_MAC_ADDRESS}
- ;;
- blue*)
- PARENT_DEV=3D${BLUE_PARENT_DEV}
- VLAN_ID=3D${BLUE_VLAN_ID}
- MAC_ADDRESS=3D${BLUE_MAC_ADDRESS}
- ;;
- orange*)
- PARENT_DEV=3D${ORANGE_PARENT_DEV}
- VLAN_ID=3D${ORANGE_VLAN_ID}
- MAC_ADDRESS=3D${ORANGE_MAC_ADDRESS}
- ;;
- esac
-
- case "${action}" in
- start)
- # If no parent device has been configured, we assume
- # that this interface is not set up for VLANs and
- # silently go on.
- [ -z "${PARENT_DEV}" ] && continue
-
- # Check if the interface does already exists.
- # If so, we skip creating it.
- if [ -d "/sys/class/net/${interface}" ]; then
- echo "Interface ${interface} already exists." >&2
- continue
- fi
-
- # Check if the parent interface exists.
- if [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then
- echo "${interface}: Parent device is not set or does not exist: ${PARENT=
_DEV}" >&2
- continue
- fi
-
- if [ -z "${VLAN_ID}" ]; then
- echo "${interface}: You did not set the VLAN ID." >&2
- continue
- fi
-
- # Build command line.
- command=3D"ip link add link ${PARENT_DEV} name ${interface}"
- if [ -n "${MAC_ADDRESS}" ]; then
- command=3D"${command} address ${MAC_ADDRESS}"
- fi
- command=3D"${command} type vlan id ${VLAN_ID}"
-
- echo "Creating VLAN interface ${interface}..."
- ${command}
-
- # Bring up the parent device.
- ip link set ${PARENT_DEV} up
- ;;
-
- stop)
- if [ ! -e "/proc/net/vlan/${interface}" ]; then
- echo "${interface} is not a VLAN interface. Skipping."
- continue
- fi
-
- echo "Removing VLAN interface ${interface}..."
- ip link set ${interface} down
- ip link delete ${interface}
- ;;
- =09
- *)
- echo "Invalid action: ${action}"
- exit 1
- ;;
- esac
-done
--=20
2.4.3
--===============7101025125156950165==--