aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristos.K <freedomrfox@gmail.com>2017-07-11 18:39:18 +0300
committerChristos.K <freedomrfox@gmail.com>2017-07-11 18:39:18 +0300
commitcf1360a9b864fdbd1dc6ae6f5a204f3fc588b1c3 (patch)
tree046732dff622993616a0e685d7399dff0409421c
parentIncluded controller chroot functions (diff)
downloadGSE-cf1360a9b864fdbd1dc6ae6f5a204f3fc588b1c3.tar.gz
GSE-cf1360a9b864fdbd1dc6ae6f5a204f3fc588b1c3.tar.bz2
GSE-cf1360a9b864fdbd1dc6ae6f5a204f3fc588b1c3.zip
Removed fetch script and moved it to functions
-rwxr-xr-xconfig.d/controller/modules/functions/cchroot.sh12
-rwxr-xr-xconfig.d/controller/modules/module-setup.sh2
2 files changed, 13 insertions, 1 deletions
diff --git a/config.d/controller/modules/functions/cchroot.sh b/config.d/controller/modules/functions/cchroot.sh
index 05a7907..b14c154 100755
--- a/config.d/controller/modules/functions/cchroot.sh
+++ b/config.d/controller/modules/functions/cchroot.sh
@@ -1,2 +1,14 @@
#!/bin/bash
+# EXPORT IMPORTANT VARIABLES BEFORE GOING ON
+source /etc/profile && export PS1="( 'Configuration Phase' ) $PS1"
+CHROOT_DIR="var/tmp/ctworkdir/"
+export CHROOT_DIR
+PATH=${PATH}:${CHDIR}
+export PATH
+if source "${CHROOT_DIR}/cchroot_functions"; then
+ echo "Exporting chroot functions"
+else
+ echo "Failed to export chroot functions, aborting"
+ exit 1
+fi \ No newline at end of file
diff --git a/config.d/controller/modules/module-setup.sh b/config.d/controller/modules/module-setup.sh
index 91782cc..934aa6d 100755
--- a/config.d/controller/modules/module-setup.sh
+++ b/config.d/controller/modules/module-setup.sh
@@ -50,7 +50,7 @@ install() {
inst_script "$moddir/functions/cfunctions.sh" "/usr/local/controller/cfunctions.sh"
inst_script "$moddir/functions/chealth.sh" "/usr/local/controller/chealth.sh"
inst_script "$moddir/functions/cnetwork.sh" "/usr/local/controller/cnetwork.sh"
- inst_script "$moddir/functions/cverify.sh" "/usr/local/controller/cverify.sh"
+ inst_script "$moddir/functions/ccrevert_chroot" "/usr/local/controller/ccrevert_chroot"
# Install configuration files
inst_simple "$moddir/sources/sources.conf" "config.d/confdir/sources/sources.conf"