From: Lucas De Marchi Date: Mon, 30 Jan 2012 21:00:58 +0000 (-0200) Subject: libkmod-module: probe: add flag to dry-run X-Git-Tag: v5~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c1ffb75d4efe799162a7780498246a8b94585fb;p=thirdparty%2Fkmod.git libkmod-module: probe: add flag to dry-run --- diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index 1229a95b..d6d08109 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -1167,10 +1167,13 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod, free(options); break; } + if (print_action != NULL) print_action(m, true, options ?: ""); - err = module_do_install_commands(m, options, &cb); + if (!(flags & KMOD_PROBE_DRY_RUN)) + err = module_do_install_commands(m, options, + &cb); } else { int state; @@ -1194,7 +1197,9 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod, if (print_action != NULL) print_action(m, false, options ?: ""); - err = kmod_module_insert_module(m, flags, options); + if (!(flags & KMOD_PROBE_DRY_RUN)) + err = kmod_module_insert_module(m, flags, + options); } free(options); diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h index cf4a7b7b..932279c0 100644 --- a/libkmod/libkmod.h +++ b/libkmod/libkmod.h @@ -129,6 +129,7 @@ enum kmod_probe { KMOD_PROBE_FORCE_MODVERSION = 0x00002, KMOD_PROBE_IGNORE_COMMAND = 0x00004, KMOD_PROBE_IGNORE_LOADED = 0x00008, + KMOD_PROBE_DRY_RUN = 0x00010, /* codes below can be used in return value, too */ KMOD_PROBE_APPLY_BLACKLIST_ALL = 0x10000,