summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-21 12:40:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-21 12:40:06 +0000
commit2d85f131e1ec9181038692493bb9daca277edb45 (patch)
tree372e90d993fe3c4506ce2f9ba0e76de7295f44f1 /perl-install/any.pm
parent68830f224661c15349199961a9ab1b05ef85d2e2 (diff)
downloaddrakx-2d85f131e1ec9181038692493bb9daca277edb45.tar
drakx-2d85f131e1ec9181038692493bb9daca277edb45.tar.gz
drakx-2d85f131e1ec9181038692493bb9daca277edb45.tar.bz2
drakx-2d85f131e1ec9181038692493bb9daca277edb45.tar.xz
drakx-2d85f131e1ec9181038692493bb9daca277edb45.zip
don't pass prefix, use $::prefix
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm28
1 files changed, 14 insertions, 14 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5c68f84f8..9eed58f0d 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -815,7 +815,7 @@ sub set_login_serial_console {
}
sub report_bug {
- my ($prefix, @other) = @_;
+ my (@other) = @_;
sub header { "
********************************************************************************
@@ -832,23 +832,23 @@ sub report_bug {
header("/sys/bus/scsi/devices"), `ls -l /sys/bus/scsi/devices`,
header("lsmod"), cat_("/proc/modules"),
header("cmdline"), cat_("/proc/cmdline"),
- header("pcmcia: stab"), cat_("$prefix/var/lib/pcmcia/stab") || cat_("$prefix/var/run/stab"),
+ header("pcmcia: stab"), cat_("$::prefix/var/lib/pcmcia/stab") || cat_("$::prefix/var/run/stab"),
header("usb"), cat_("/proc/bus/usb/devices"),
header("partitions"), cat_("/proc/partitions"),
header("cpuinfo"), cat_("/proc/cpuinfo"),
- header("syslog"), cat_("/tmp/syslog") || cat_("$prefix/var/log/syslog"),
+ header("syslog"), cat_("/tmp/syslog") || cat_("$::prefix/var/log/syslog"),
header("ddcxinfos"), ddcxinfos(),
- header("stage1.log"), cat_("/tmp/stage1.log") || cat_("$prefix/root/drakx/stage1.log"),
- header("ddebug.log"), cat_("/tmp/ddebug.log") || cat_("$prefix/root/drakx/ddebug.log"),
- header("install.log"), cat_("$prefix/root/drakx/install.log"),
- header("fstab"), cat_("$prefix/etc/fstab"),
- header("modules.conf"), cat_("$prefix/etc/modules.conf"),
- header("lilo.conf"), cat_("$prefix/etc/lilo.conf"),
- header("menu.lst"), cat_("$prefix/boot/grub/menu.lst"),
- header("XF86Config"), cat_("$prefix/etc/X11/XF86Config"),
- header("XF86Config-4"), cat_("$prefix/etc/X11/XF86Config-4"),
- header("/etc/modules"), cat_("$prefix/etc/modules"),
- header("sysconfig/i18n"), cat_("$prefix/etc/sysconfig/i18n"),
+ header("stage1.log"), cat_("/tmp/stage1.log") || cat_("$::prefix/root/drakx/stage1.log"),
+ header("ddebug.log"), cat_("/tmp/ddebug.log") || cat_("$::prefix/root/drakx/ddebug.log"),
+ header("install.log"), cat_("$::prefix/root/drakx/install.log"),
+ header("fstab"), cat_("$::prefix/etc/fstab"),
+ header("modules.conf"), cat_("$::prefix/etc/modules.conf"),
+ header("lilo.conf"), cat_("$::prefix/etc/lilo.conf"),
+ header("menu.lst"), cat_("$::prefix/boot/grub/menu.lst"),
+ header("XF86Config"), cat_("$::prefix/etc/X11/XF86Config"),
+ header("XF86Config-4"), cat_("$::prefix/etc/X11/XF86Config-4"),
+ header("/etc/modules"), cat_("$::prefix/etc/modules"),
+ header("sysconfig/i18n"), cat_("$::prefix/etc/sysconfig/i18n"),
map_index { even($::i) ? header($_) : $_ } @other;
}
s='ctx'> use log;
use detect_devices;
@@ -199,7 +200,7 @@ If you don't want to use the auto detection, deselect the checkbox.
load_conf($netcnx, $netc, $intf);
$conf{modem} and do { pre_func("modem"); require network::modem; network::modem::configure($in, $netcnx, $mouse, $netc, $intf) or goto step_2 };
$conf{winmodem} and do { pre_func("winmodem"); require network::modem; network::modem::winmodemConfigure($in, $netc) or goto step_2 };
- $conf{isdn} and do { pre_func("isdn"); require network::isdn; network::isdn::configure($netcnx, $netc, $isdn) or goto step_2 };
+ $conf{isdn} and do { pre_func("isdn"); require network::isdn; network::isdn::configure($netcnx, $netc, undef) or goto step_2 };
$conf{adsl} and do { pre_func("adsl"); require network::adsl; network::adsl::configure($netcnx, $netc, $intf, $first_time) or goto step_2 };
$conf{cable} and do { pre_func("cable"); require network::ethernet; network::ethernet::configure_cable($netcnx, $netc, $intf, $first_time) or goto step_2; $netconnect::need_restart_network = 1 };
$conf{lan} and do { pre_func("local network"); require network::ethernet; network::ethernet::configure_lan($netcnx, $netc, $intf, $first_time) or goto step_2; $netconnect::need_restart_network = 1 };
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 8101859af..ee129007f 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -3,6 +3,7 @@ package network::network; # $Id$wir
#-######################################################################################
#- misc imports
#-######################################################################################
+use strict;
use Socket;
use common;
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index a1fcf5aba..6f01bca0a 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -2,7 +2,7 @@ package network::shorewall; # $Id$
-
+use strict;
use detect_devices;
use network::netconnect;
use run_program;
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index acaae8cad..6db983f9a 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -1,5 +1,6 @@
package network::tools;
+use strict;
use common;
use run_program;
use c;