From b31446a81d5ec395245290737410e866f82d0976 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 3 Feb 2004 16:17:20 +0000
Subject: (parameters) fix modinfo parsing (format had been altered between
 modutils and module-init-tools :-()

---
 perl-install/modules/parameters.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/perl-install/modules/parameters.pm b/perl-install/modules/parameters.pm
index d6338f8e1..66590f7d8 100644
--- a/perl-install/modules/parameters.pm
+++ b/perl-install/modules/parameters.pm
@@ -21,7 +21,11 @@ sub parameters {
   foreach (common::join_lines(run_program::get_stdout('modinfo', '-p', $module))) {
       chomp;
       next if /^warning:/;
-      (my $name, $_) = /(\S+)\s+(.*)/s or warn "modules::parameters::get_options_name($module): unknown line\n";
+      (my $name, $_) = /(\w+)(?::|\s+)(.*)/s or warn "modules::parameters::get_options_name($module): unknown line\n";
+      if (c::kernel_version() =~ /^\Q2.6/) {
+          push @parameters, [ $name, '', $_ ];
+          next;
+      }
 
       my $c_types = 'int|string|short|byte|char|long';
       my ($is_a_number, $description, $min, $max) = (0, '', 1, 1);
-- 
cgit v1.2.1