nwfilter: Move creation of configDir to driver initialization

Rather than "wait" for the first config file to be created, force creation
of the configDir during driver state initialization.

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 752d4e18a0c710d3626cc0f20c4274ebd9a9720f..032700c76b2fef5c568ddce385ab81ed3643ef56 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -2778,13 +2778,6 @@ virNWFilterSaveXML(const char *configDir,
     if (!(configFile = virFileBuildPath(configDir, def->name, ".xml")))
         goto cleanup;
 
-    if (virFileMakePath(configDir) < 0) {
-        virReportSystemError(errno,
-                             _("cannot create config directory '%s'"),
-                             configDir);
-        goto cleanup;
-    }
-
     virUUIDFormat(def->uuid, uuidstr);
     ret = virXMLSaveFile(configFile,
                          virXMLPickShellSafeComment(def->name, uuidstr),

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index faa4fe8d25fdf495dfc041d4c9849df91d678753..5e620234ecd3fa18ff84bc3eabdc2f0a96d04872 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -40,6 +40,7 @@
 #include "nwfilter_driver.h"
 #include "nwfilter_gentech_driver.h"
 #include "configmake.h"
+#include "virfile.h"
 #include "virstring.h"
 #include "viraccessapicheck.h"
 
@@ -237,6 +238,12 @@ nwfilterStateInitialize(bool privileged,
 
     VIR_FREE(base);
 
+    if (virFileMakePathWithMode(driver->configDir, S_IRWXU) < 0) {
+        virReportSystemError(errno, _("cannot create config directory '%s'"),
+                             driver->configDir);
+        goto error;
+    }
+
     if (!(driver->nwfilters = virNWFilterObjListNew()))
         goto error;