summaryrefslogtreecommitdiffstats
path: root/repoman/bin
diff options
context:
space:
mode:
authorRoberto Hueso Gómez <rhueso@soleta.eu>2020-10-19 13:38:11 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2020-10-22 12:50:37 +0200
commit4972d15ecd21a6f8dfe6f8451d19ac678fa2865b (patch)
tree9cf270d2e9c9522a0f4590864082c14f96999a63 /repoman/bin
parenta0dd47a79ca4d5a06979fe22827bf7d4ea178fb7 (diff)
#988 Read json config file in scripts
This patch implements the function source_json_config() that is used to read the new ogserver.json config file in the scripts. This replaces the old 'source .../ogserver.cfg'. Co-authored-by: Javier Sánchez Parra <jsanchez@soleta.eu>
Diffstat (limited to 'repoman/bin')
-rwxr-xr-xrepoman/bin/importimage4
1 files changed, 2 insertions, 2 deletions
diff --git a/repoman/bin/importimage b/repoman/bin/importimage
index db652f9d..9ced5b78 100755
--- a/repoman/bin/importimage
+++ b/repoman/bin/importimage
@@ -20,16 +20,16 @@
OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"}
REPODIR="$OPENGNSYS/images"
REPOCONF="$OPENGNSYS/etc/ogAdmRepo.cfg"
-SERVERCONF="$OPENGNSYS/etc/ogserver.cfg"
+SERVERCONF="$OPENGNSYS/etc/ogserver.json"
DEFAULTFILE="/etc/default/opengnsys"
let BACKUP=0
source $DEFAULTFILE
source $REPOCONF &>/dev/null
-[ "$RUN_OGADMSERVER" == "yes" ] && source $SERVERCONF &>/dev/null
# Functions.
source $OPENGNSYS/lib/ogfunctions.sh || exit 1
+[ "$RUN_OGADMSERVER" == "yes" ] && source_json_config $SERVERCONF &>/dev/null
# Main program.