Skip to content
Snippets Groups Projects
Commit b47ae699 authored by Jakob Olsson's avatar Jakob Olsson
Browse files

ts: deprecate revert teardown and minor cleanup

parent e4de3782
Branches
No related tags found
1 merge request!387ts: restart network from init.d script
...@@ -219,19 +219,6 @@ EOF ...@@ -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 local vid=$1
diff="" diff=""
...@@ -239,8 +226,6 @@ EOF ...@@ -239,8 +226,6 @@ EOF
[ ! -f $MAPDIR/network.old ] && cp /etc/config/network $MAPDIR/network.old [ ! -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) exists=$(config_foreach net_check_for_vlan bridge-vlan $vid)
[ -z "$exists" ] && { [ -z "$exists" ] && {
local name="vlan${vid}" local name="vlan${vid}"
...@@ -516,22 +501,6 @@ EOF ...@@ -516,22 +501,6 @@ EOF
done 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 local func=$1
shift shift
...@@ -541,7 +510,6 @@ EOF ...@@ -541,7 +510,6 @@ EOF
reload) ts_dbg "reload $@"; ts_reload $@;; reload) ts_dbg "reload $@"; ts_reload $@;;
cleanup) ts_dbg "cleanup $@"; ts_cleanup $@;; cleanup) ts_dbg "cleanup $@"; ts_cleanup $@;;
isolate) ts_dbg "isolate $@"; ts_isolate $@;; isolate) ts_dbg "isolate $@"; ts_isolate $@;;
revert) ts_dbg "revert $@"; ts_revert $@;;
--help|help) ts_usage;; --help|help) ts_usage;;
*) ts_usage; exit 1;; *) ts_usage; exit 1;;
esac esac
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment