From b47ae699d345ed0a2f638970acf599c3d820b7d4 Mon Sep 17 00:00:00 2001 From: Jakob Olsson <jakob.olsson@iopsys.eu> Date: Fri, 2 Jun 2023 15:10:20 +0200 Subject: [PATCH] ts: deprecate revert teardown and minor cleanup --- src/script/traffic_separation | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/src/script/traffic_separation b/src/script/traffic_separation index 0b608c5f2..a0c812a32 100755 --- a/src/script/traffic_separation +++ b/src/script/traffic_separation @@ -219,19 +219,6 @@ EOF } } - net_set_primary() { - local section=$1 - local pvid=$2 - - config_get device "$section" device - - [ "${AL_BRIDGE}" = "$device" ] && { - uci -q set network.${section}.device="${AL_BRIDGE}.${pvid}" - uci -q commit network - diff="1" - break; - } - } local vid=$1 diff="" @@ -239,8 +226,6 @@ EOF [ ! -f $MAPDIR/network.old ] && cp /etc/config/network $MAPDIR/network.old - #[ -x "/usr/sbin/mapcontroller" ] && config_foreach net_set_primary interface $PRIMARY_VID - exists=$(config_foreach net_check_for_vlan bridge-vlan $vid) [ -z "$exists" ] && { local name="vlan${vid}" @@ -516,22 +501,6 @@ EOF done } - ts_revert() { - local restart="" - - cd $MAPDIR/ 2>/dev/null || return 0 - files="$(ls -r network*.patch)" - [ -z "$files" ] && return 0 - for file in $files; do - patch -p0 -R -i $file - [ "$?" == 0 ] && restart="1" - rm -rf $file - done - rm $MAPDIR/network.old - - [ "$restart" != "" ] && /etc/init.d/network restart - } - local func=$1 shift @@ -541,7 +510,6 @@ EOF reload) ts_dbg "reload $@"; ts_reload $@;; cleanup) ts_dbg "cleanup $@"; ts_cleanup $@;; isolate) ts_dbg "isolate $@"; ts_isolate $@;; - revert) ts_dbg "revert $@"; ts_revert $@;; --help|help) ts_usage;; *) ts_usage; exit 1;; esac -- GitLab