aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos.K <freedomrfox@gmail.com>2017-08-22 13:51:58 +0300
committerChristos.K <freedomrfox@gmail.com>2017-08-22 13:51:58 +0300
commit40127e4346275d8034ea57b11f89c0a75f3cdab6 (patch)
tree3ba37df0929fe745992c329dc19c917ea0ca7697
parentMajor dev changes (diff)
downloadGSE-40127e4346275d8034ea57b11f89c0a75f3cdab6.tar.gz
GSE-40127e4346275d8034ea57b11f89c0a75f3cdab6.tar.bz2
GSE-40127e4346275d8034ea57b11f89c0a75f3cdab6.zip
Major network function change
-rwxr-xr-xconfig.d/controller/modules/functions/cnetwork.sh36
1 files changed, 8 insertions, 28 deletions
diff --git a/config.d/controller/modules/functions/cnetwork.sh b/config.d/controller/modules/functions/cnetwork.sh
index 6dbafdc..86ec5be 100755
--- a/config.d/controller/modules/functions/cnetwork.sh
+++ b/config.d/controller/modules/functions/cnetwork.sh
@@ -1,12 +1,15 @@
#!/bin/bash
-# CALL NETWORK FUNCtiON
-if _call_net; then
- # CALL ACTIVE SERVER DEFINITION FUNCTION
- _server_exp
+# NET FUNCTIONS
+source "${CTSCRIPTS}/ct_netf.sh"
+# EXPORT SERVER
+_server_exp
+
+# CHECK IF NETSELECT OR CUSTOM NET SCRIPT HAS MANAGED TO DEFINE A SERVER
+if _check_net; then
# SET NET FLAG TO 0 IF AN ACTIVE SERVER HAS BEEN SET, OTHERWISE SET TO 1
- if [[ -n "${_act_ser}" ]]; then
+ if [[ -n "${_ctserver}" ]]; then
_ctflag_net=0
else
_ctflag_net=1
@@ -14,26 +17,3 @@ if _call_net; then
export _ctflag_net
fi
-# CHECK NETWORK FLAG AND FETCH VERSION AND CONFIG.D DIRECTORY
-if [[ "${_ctflag_net}" == 0 ]]; then
- # DEFINE BEST ACTIVE SERVER
- _server_exp
-
- # MOUNT SYSFS AS RW
- _mount_sysfs "/mnt/workdir"
-
- # SOURCES EXP
- _sources_exp
-
- # FETCH CONFIG.D
- _fetch_confd
- if [[ "$_ctflag_confd}" == 0 ]]; then
- # EXPORT NEW CONFIGS
- _bsu_dfs
- fi
-
- # MOUNT SYSFS AS RW
- _mount_sysfs "/mnt/workdir"
- # CHECK LOCAL VERSION OF SYSFS WITH SERVERS VERSION
- _check_version
-fi