Merge pull request flux-framework#69 from garlick/rpm-build-fixes

regressions that were preventing an RPM from being built
garlick · Oct 17, 2014 · 2b3aafc · 2b3aafc
2 parents c6442fb + 0e150b3
commit 2b3aafc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,8 +1,7 @@
 SUBDIRS = src doc t
 
-sysconf_DATA = \
-	etc/flux/config
 noinst_DATA = \
+	etc/flux/config \
 	etc/flux/curve
 
 etc/flux/config: $(srcdir)/flux.conf.in

diff --git a/src/cmd/flux.c b/src/cmd/flux.c
@@ -188,12 +188,14 @@ int main (int argc, char *argv[])
         err_exit ("setenv");
     /* Process config from the KVS if running in a session and not
      * forced to use a config file by the command line.
+     * It is not an error if config is not foud in either place, we will
+     * try to make do with compiled-in defaults.
      */
     if (getenv ("FLUX_TMPDIR") && !Fopt) {
         flux_t h;
         if (!(h = flux_api_open ()))
             err_exit ("flux_api_open");
-        if (kvs_conf_load (h, cf) < 0)
+        if (kvs_conf_load (h, cf) < 0 && errno != ENOENT)
             err_exit ("could not load config from KVS");
         flux_api_close (h);
     } else {