Do not call init() if -n (dryrun) is set.

mrclksr · Feb 10, 2021 · 678a6d8 · 678a6d8
1 parent 0264ad8
commit 678a6d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/config.c b/config.c
@@ -166,7 +166,7 @@ call_cfg_function(config_t *cfg, const char *fname, const devinfo_t *dev,
 }
 
 config_t *
-open_cfg(const char *path)
+open_cfg(const char *path, bool init)
 {
 	config_t *cfg;
 
@@ -184,7 +184,8 @@ open_cfg(const char *path)
 	luaL_openlibs(cfg->luastate);
 	if (luaL_dofile(cfg->luastate, PATH_CFG_FILE) != 0)
 		diex("%s", lua_tostring(cfg->luastate, -1));
-	call_cfg_function(cfg, "init", NULL, NULL);
+	if (init)
+		call_cfg_function(cfg, "init", NULL, NULL);
 	cfg->exclude = getstrarr(cfg->luastate, "exclude_kmods",
 	    &cfg->exclude_len);
 

diff --git a/config.h b/config.h
@@ -38,5 +38,5 @@ typedef struct config_s {
 
 extern int	call_cfg_function(config_t *, const char *, const devinfo_t *,
 			const char *);
-extern config_t	*open_cfg(const char *);
+extern config_t	*open_cfg(const char *, bool);
 #endif
diff --git a/dsbdriverd.c b/dsbdriverd.c
@@ -455,7 +455,7 @@ initcfg()
 {
 	int i;
 
-	cfg = open_cfg(PATH_CFG_FILE);
+	cfg = open_cfg(PATH_CFG_FILE, !dryrun);
 	if (cfg == NULL)
 		return;
 	if (cfg->exclude == NULL)