From 12c8cddf2713d8c07b4f0adcda659721148c8b7b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 16 Aug 2017 14:43:42 +0000 Subject: [PATCH] Drop bridge-stp script This is not doing anything useful for us any more and the kernel is always logging "failed to start userspace STP" which is true, but it is not meant to start. So to avoid any confusion, we will just drop this script. Fixes: #11464 Signed-off-by: Michael Tremer --- Makefile.am | 10 ----- src/functions/functions.constants | 4 -- src/helpers/bridge-stp | 64 ------------------------------- 3 files changed, 78 deletions(-) delete mode 100644 src/helpers/bridge-stp diff --git a/Makefile.am b/Makefile.am index 29149db0..22c88ad0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -176,7 +176,6 @@ dist_network_SCRIPTS = \ src/ppp/pppoe-server dist_helpers_SCRIPTS = \ - src/helpers/bridge-stp \ src/helpers/dhcpd-config-helper \ src/helpers/firewall-kernel-init \ src/helpers/hostapd-config-helper \ @@ -191,15 +190,6 @@ bin_PROGRAMS = \ src_inetcalc_SOURCES = \ src/inetcalc.c -bridge-stp-install-hook: bridge-stp-uninstall-hook - ln -svf --relative $(DESTDIR)$(helpersdir)/bridge-stp $(DESTDIR)$(sbindir)/ - -bridge-stp-uninstall-hook: - rm -f $(DESTDIR)$(sbindir)/bridge-stp - -INSTALL_EXEC_HOOKS += bridge-stp-install-hook -UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook - dist_hooks_configs_SCRIPTS = \ src/hooks/configs/dhcp \ src/hooks/configs/ipv4-static \ diff --git a/src/functions/functions.constants b/src/functions/functions.constants index 91e5ffcf..c2db955c 100644 --- a/src/functions/functions.constants +++ b/src/functions/functions.constants @@ -76,10 +76,6 @@ EXIT_DAD_OK=0 EXIT_DAD_FAILED=8 EXIT_DAD_TENTATIVE=8 -# Spanning Tree Protocol -EXIT_STP_KERNEL=1 -EXIT_STP_ERROR=2 - STATUS_UP=0 STATUS_DOWN=1 STATUS_NOCARRIER=2 diff --git a/src/helpers/bridge-stp b/src/helpers/bridge-stp deleted file mode 100644 index 30745385..00000000 --- a/src/helpers/bridge-stp +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire - An Open Source Firewall Solution # -# Copyright (C) 2011 IPFire development team # -# # -# This program 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 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see . # -# # -############################################################################### - -# Change LOG_FACILITY that we will find our messages in syslog. -LOG_FACILITY=$(basename ${0}) - -. /usr/lib/network/functions - -# Read network settings -network_settings_read - -zone=${1} -assert isset zone - -action=${2} -assert isset action - -# Exit immediately, if zone configuration does not exist. -# This is for manually created bridges. -if ! zone_exists ${zone}; then - exit ${EXIT_KERNEL_STP} -fi - -# Read zone settings -zone_settings_read "${zone}" --ignore-superfluous-settings STP - -# Make sure STP is enabled for this zone. -if ! enabled STP; then - log ERROR "The kernel tried to enable STP for zone ${zone}" - log ERROR "but our configuration disagrees" - exit ${EXIT_STP_ERROR} -fi - -case "${action}" in - start) - log INFO "STP activated for ${zone}" - exit ${EXIT_STP_KERNEL} - ;; - stop) - log INFO "STP deactivated for ${zone}" - exit ${EXIT_OK} - ;; - *) - log ERROR "Unknown action: ${action}" - exit ${EXIT_STP_ERROR} -esac -- 2.39.2