summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenGnSys Support Team <soporte-og@soleta.eu>2020-10-06 13:01:32 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2020-10-06 13:01:54 +0200
commitd89d6c6ce749f0d7dd89e3f6fabe2772f01b8b41 (patch)
treef0923de202083d931ce433c47a4f912a8ebc3e5c
parent7500700777fa9b66d3bff94c6a0846d7ffdb2365 (diff)
#1004 set default path to repository
This is /opt/opengnsys/images if not specified.
-rw-r--r--src/cfg.c3
-rw-r--r--src/main.c7
2 files changed, 7 insertions, 3 deletions
diff --git a/src/cfg.c b/src/cfg.c
index f4361ec..42da3a5 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -174,8 +174,7 @@ int parse_json_config(const char *filename, struct og_server_cfg *cfg)
if ((flags & OG_SERVER_CFG_REST) &&
(flags & OG_SERVER_CFG_DB) &&
- (flags & OG_SERVER_CFG_WOL) &&
- (flags & OG_SERVER_CFG_REPO)) {
+ (flags & OG_SERVER_CFG_WOL)) {
ret = 0;
} else {
syslog(LOG_ERR, "Missing attributes in json file");
diff --git a/src/main.c b/src/main.c
index 38494a7..9fe13ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,8 +25,13 @@ static struct option og_server_opts[] = {
};
#define OG_SERVER_CFG_JSON "/opt/opengnsys/cfg/ogserver.json"
+#define OG_SERVER_REPO_PATH "/opt/opengnsys/images"
-struct og_server_cfg cfg;
+struct og_server_cfg cfg = {
+ .repo = {
+ .dir = OG_SERVER_REPO_PATH,
+ },
+};
int main(int argc, char *argv[])
{