From 6cf25e17064cb213ef8c3a9c84ab787dd2852f2a Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 5 Mar 2014 15:02:44 +0100 Subject: [PATCH 4/6] modprobe: Implement --allow-unsupported-modules References: fate#316971 Patch-mainline: never --- Makefile.am | 4 +++- libkmod/libkmod-unsupported.c | 9 +++++++++ libkmod/libkmod-unsupported.h | 8 ++++++++ shared/macro.h | 1 + tools/modprobe.c | 8 +++++++- 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 libkmod/libkmod-unsupported.c create mode 100644 libkmod/libkmod-unsupported.h Index: kmod-34/Makefile.am =================================================================== --- kmod-34.orig/Makefile.am +++ kmod-34/Makefile.am @@ -113,7 +113,9 @@ libkmod_libkmod_la_LIBADD = \ ${libzstd_LIBS} ${liblzma_LIBS} ${zlib_LIBS} ${libcrypto_LIBS} noinst_LTLIBRARIES += libkmod/libkmod-internal.la -libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) +libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) \ + libkmod/libkmod-unsupported.c \ + libkmod/libkmod-unsupported.h libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \ -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES) Index: kmod-34/libkmod/libkmod-unsupported.c =================================================================== --- /dev/null +++ kmod-34/libkmod/libkmod-unsupported.c @@ -0,0 +1,9 @@ +#include "libkmod-internal.h" +#include "libkmod-unsupported.h" + +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx) +{ + struct kmod_config *config = (struct kmod_config *)kmod_get_config(ctx); + + config->block_unsupported = 0; +} Index: kmod-34/libkmod/libkmod-unsupported.h =================================================================== --- /dev/null +++ kmod-34/libkmod/libkmod-unsupported.h @@ -0,0 +1,8 @@ +#pragma once + +/* + * This function implements the --allow-unsupported-modules modprobe + * option. It is not part of the kmod API and not exported by the shared + * library + */ +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx); Index: kmod-34/shared/macro.h =================================================================== --- kmod-34.orig/shared/macro.h +++ kmod-34/shared/macro.h @@ -5,6 +5,7 @@ #pragma once #include +#include #if defined(HAVE_STATIC_ASSERT) #define assert_cc(expr) _Static_assert((expr), #expr) Index: kmod-34/tools/modprobe.c =================================================================== --- kmod-34.orig/tools/modprobe.c +++ kmod-34/tools/modprobe.c @@ -27,6 +27,8 @@ #include "kmod.h" +#include "libkmod/libkmod-unsupported.h" + static int log_priority = LOG_CRIT; #define LOG(...) log_printf(log_priority, __VA_ARGS__) @@ -759,6 +761,7 @@ static int do_modprobe(int argc, char ** const char *dirname = NULL; const char *root = NULL; const char *kversion = NULL; + int allow_unsupported = 0; int use_all = 0; int do_remove = 0; int do_show_config = 0; @@ -862,7 +865,7 @@ static int do_modprobe(int argc, char ** kversion = optarg; break; case 128: - /* --allow-unsupported-modules does nothing for now */ + allow_unsupported = 1; break; case 's': env_modprobe_options_append("-s"); @@ -944,6 +947,9 @@ static int do_modprobe(int argc, char ** log_setup_kmod_log(ctx, verbose); + if (allow_unsupported) + kmod_internal_allow_unsupported(ctx); + kmod_load_resources(ctx); if (do_show_config)