diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-22 11:05:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-22 11:05:18 -0300 |
| commit | 2352f09f581b24fa01f022026728acf919c0335a (patch) | |
| tree | 36667ad9212b04db2500f304da5ac4a611cce5c9 /testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch | |
| parent | 7e9d319e9575e68d86463b792425fcdba0f195d2 (diff) | |
| parent | 99746708edfd2c56f2ba654a14f27e98b1601a43 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas3/PKGBUILD
community-staging/luminancehdr/PKGBUILD
community-staging/luxrays/PKGBUILD
community-staging/luxrender/PKGBUILD
community-staging/performous/PKGBUILD
community-staging/widelands/PKGBUILD
community/chmsee/PKGBUILD
community/flac123/PKGBUILD
community/pam-krb5/PKGBUILD
community/python-pyxattr/PKGBUILD
extra/postgresql/PKGBUILD
extra/pygobject2/PKGBUILD
extra/python-lxml/PKGBUILD
extra/usbview/PKGBUILD
extra/vlc/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/bzflag/PKGBUILD
staging/calligra/PKGBUILD
staging/enblend-enfuse/PKGBUILD
staging/gegl/PKGBUILD
staging/hugin/PKGBUILD
staging/inkscape/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/btrfs-progs/initcpio-hook-btrfs
testing/btrfs-progs/initcpio-install-btrfs
testing/cryptsetup/PKGBUILD
testing/cryptsetup/encrypt_hook
testing/empathy/PKGBUILD
testing/evolution/PKGBUILD
testing/glibmm/PKGBUILD
testing/gtkglext/PKGBUILD
testing/ibus/PKGBUILD
testing/kmod/PKGBUILD
testing/udisks2/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch')
| -rw-r--r-- | testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch b/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch new file mode 100644 index 000000000..4ef3d2775 --- /dev/null +++ b/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch @@ -0,0 +1,33 @@ +From 66f3228d17d66d7e2dd484427259290fbc82b2f0 Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Date: Mon, 8 Oct 2012 19:04:16 -0300 +Subject: [PATCH] libkmod: Add support for '.' in module parameter on kcmdline + +Otherwise we fail to parse arguments in kernel command line like +testmodule.testparam=1.5G + +Suggested-by: Selim T. Erdogan <selim@alumni.cs.utexas.edu> +--- + libkmod/libkmod-config.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c +index 70044f0..398468e 100644 +--- a/libkmod/libkmod-config.c ++++ b/libkmod/libkmod-config.c +@@ -567,8 +567,10 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) + modname = p + 1; + break; + case '.': +- *p = '\0'; +- param = p + 1; ++ if (param == NULL) { ++ *p = '\0'; ++ param = p + 1; ++ } + break; + case '=': + if (param != NULL) +-- +1.7.12.4 + |