rename modparm as modules::parameters

4 files changed, 7 insertions, 7 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index d5033bbe8..96dd5b657 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -714,8 +714,8 @@ sub load_category__prompt {
     my $module_descr = $available_modules{$module};
 
     my $options;
-    require modparm;
-    my @parameters = modparm::parameters($module);
+    require modules::parameters;
+    my @parameters = modules::parameters::parameters($module);
     if (@parameters && $in->ask_from_list_('',
 N("In some cases, the %s driver needs to have extra information to work
 properly, although it normally works fine without. Would you like to specify
diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm
index b4ce5280e..71b72a5b2 100644
--- a/perl-install/modules/interactive.pm
+++ b/perl-install/modules/interactive.pm
@@ -7,9 +7,9 @@ sub config_window {
     require modules;
     modules::mergein_conf('/etc/modules.conf');
     my %conf = modules::get_parameters($data->{driver});
-    require modparm;
+    require modules::parameters;
     my @l;
-    foreach (modparm::parameters($data->{driver})) {
+    foreach (modules::parameters::parameters($data->{driver})) {
 	   my ($name, $format, $description) = @$_;
 	   push @l, { label => $name, help => "$description\n[$format]", val => \$conf{$name} };
     }
diff --git a/perl-install/modparm.pm b/perl-install/modules/parameters.pm
index 70da67c47..59829389c 100644
--- a/perl-install/modparm.pm
+++ b/perl-install/modules/parameters.pm
@@ -1,4 +1,4 @@
-package modparm; # $Id$
+package modules::parameters; # $Id$
 
 use diagnostics;
 use strict;
@@ -26,7 +26,7 @@ sub parameters {
   foreach (common::join_lines(`$modinfo -p $module`)) {
       chomp;
       next if /^warning:/;
-      (my $name, $_) = /(\S+)\s+(.*)/s or warn "modparm::get_options_name($module): unknown line\n";
+      (my $name, $_) = /(\S+)\s+(.*)/s or warn "modules::parameters::get_options_name($module): unknown line\n";
 
       my $c_types = 'int|string|short|byte|char|long';
       my ($is_a_number, $description, $min, $max) = (0, '', 1, 1);
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index 48852af5f..514585d27 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -204,7 +204,7 @@ sub explanations { c::syslog(c::LOG_INFO()|c::LOG_LOCAL1(), "@_") }
 
 our @common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setExportedVarsInSh setExportedVarsInCsh update_gnomekderc);
 our @builtin_functs = qw(chmod chown unlink link symlink rename system);
-our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree Xconfig::xfree3 Xconfig::xfree4 Xconfig::xfreeX any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modparm modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall);
+our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree Xconfig::xfree3 Xconfig::xfree4 Xconfig::xfreeX any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall);
 
 $SIG{SEGV} = sub { my $progname = $0; $progname =~ s|.*/||; exec("drakbug --incident $progname") };