103 lines
3.1 KiB
Diff
103 lines
3.1 KiB
Diff
|
From 714b9b5241f5fc6120c74f35d6a374e032bad6df Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Marek <mmarek@suse.cz>
|
||
|
|
Date: Wed, 5 Mar 2014 15:02:44 +0100
|
||
|
|
Subject: [PATCH 10/10] modprobe: Implement --allow-unsupported-modules
|
||
|
|
|
||
|
|
References: fate#316971
|
||
|
|
Patch-mainline: never
|
||
|
|
---
|
||
|
|
Makefile.am | 4 +++-
|
||
|
|
libkmod/libkmod-unsupported.c | 9 +++++++++
|
||
|
|
libkmod/libkmod-unsupported.h | 8 ++++++++
|
||
|
|
tools/modprobe.c | 7 ++++++-
|
||
|
|
4 files changed, 26 insertions(+), 2 deletions(-)
|
||
|
|
create mode 100644 libkmod/libkmod-unsupported.c
|
||
|
|
create mode 100644 libkmod/libkmod-unsupported.h
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index 46b7652..9986730 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -78,7 +78,9 @@ libkmod_libkmod_la_LIBADD = libkmod/libkmod-util.la \
|
||
|
|
${liblzma_LIBS} ${zlib_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)
|
||
|
|
diff --git a/libkmod/libkmod-unsupported.c b/libkmod/libkmod-unsupported.c
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..7ef9fc8
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/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;
|
||
|
|
+}
|
||
|
|
diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..a95b4a2
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/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);
|
||
|
|
diff --git a/tools/modprobe.c b/tools/modprobe.c
|
||
|
|
index 589cc07..7d0949d 100644
|
||
|
|
--- a/tools/modprobe.c
|
||
|
|
+++ b/tools/modprobe.c
|
||
|
|
@@ -33,6 +33,7 @@
|
||
|
|
|
||
|
|
#include "libkmod.h"
|
||
|
|
#include "libkmod-array.h"
|
||
|
|
+#include "libkmod-unsupported.h"
|
||
|
|
#include "macro.h"
|
||
|
|
|
||
|
|
#include "kmod.h"
|
||
|
|
@@ -755,6 +756,7 @@ static int do_modprobe(int argc, char **orig_argv)
|
||
|
|
int do_remove = 0;
|
||
|
|
int do_show_config = 0;
|
||
|
|
int do_show_modversions = 0;
|
||
|
|
+ int allow_unsupported = 0;
|
||
|
|
int err;
|
||
|
|
|
||
|
|
argv = prepend_options_from_env(&argc, orig_argv);
|
||
|
|
@@ -838,7 +840,7 @@ static int do_modprobe(int argc, char **orig_argv)
|
||
|
|
kversion = optarg;
|
||
|
|
break;
|
||
|
|
case 128:
|
||
|
|
- /* --allow-unsupported-modules does nothing for now */
|
||
|
|
+ allow_unsupported = 1;
|
||
|
|
break;
|
||
|
|
case 's':
|
||
|
|
env_modprobe_options_append("-s");
|
||
|
|
@@ -910,6 +912,9 @@ static int do_modprobe(int argc, char **orig_argv)
|
||
|
|
|
||
|
|
log_setup_kmod_log(ctx, verbose);
|
||
|
|
|
||
|
|
+ if (allow_unsupported)
|
||
|
|
+ kmod_internal_allow_unsupported(ctx);
|
||
|
|
+
|
||
|
|
kmod_load_resources(ctx);
|
||
|
|
|
||
|
|
if (do_show_config)
|
||
|
|
--
|
||
|
|
1.8.4.5
|
||
|
|
|