Magellan Linux

Contents of /trunk/kmod/patches/kmod-7-fix-options.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1732 - (show annotations) (download)
Wed Apr 4 15:06:10 2012 UTC (12 years ago) by niro
File size: 1232 byte(s)
-fix options, upstream patch
1 From 02629fa02e96763db7460a930239cc93649a52f8 Mon Sep 17 00:00:00 2001
2 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
3 Date: Thu, 22 Mar 2012 12:00:16 -0300
4 Subject: [PATCH] modprobe: fix typo in config dump: option->options
5
6 kmod uses "option MODNAME", not "options MODNAME"
7
8 --- modprobe-sorted.kmod 2012-03-21 22:31:03.751754042 +0200
9 +++ modprobe-sorted.module-init-tools 2012-03-21 22:30:49.561753089 +0200
10 @@ -1,6 +1,23 @@
11 [...]
12 -option uvesafb mode_option=1024x786-32 mtrr=4 scroll=ywrap
13 +options uvesafb mode_option=1024x786-32 mtrr=4 scroll=ywrap
14
15 This breaks scripts that depend in modprobe -c output grepping
16 ---
17 tools/kmod-modprobe.c | 2 +-
18 1 files changed, 1 insertions(+), 1 deletions(-)
19
20 diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
21 index 4760682..f6d47dc 100644
22 --- a/tools/kmod-modprobe.c
23 +++ b/tools/kmod-modprobe.c
24 @@ -218,7 +218,7 @@ static int show_config(struct kmod_ctx *ctx)
25 { "install", kmod_config_get_install_commands },
26 { "remove", kmod_config_get_remove_commands },
27 { "alias", kmod_config_get_aliases },
28 - { "option", kmod_config_get_options },
29 + { "options", kmod_config_get_options },
30 { "softdep", kmod_config_get_softdeps },
31 };
32 size_t i;
33 --
34 1.7.6.5
35