summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-16 16:49:53 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-16 16:49:53 +0000
commitba8e8f1212675679d40009210454f62d26db2182 (patch)
treeb6cb9683eb255fde720be4e129857d90aa30c97c
parent2fdb9db2e8839891d304a31c21f83434048220d6 (diff)
downloaddrakx-backup-do-not-use-ba8e8f1212675679d40009210454f62d26db2182.tar
drakx-backup-do-not-use-ba8e8f1212675679d40009210454f62d26db2182.tar.gz
drakx-backup-do-not-use-ba8e8f1212675679d40009210454f62d26db2182.tar.bz2
drakx-backup-do-not-use-ba8e8f1212675679d40009210454f62d26db2182.tar.xz
drakx-backup-do-not-use-ba8e8f1212675679d40009210454f62d26db2182.zip
do not abuse global namespace
-rwxr-xr-xperl-install/standalone/drakautoinst4
-rwxr-xr-xperl-install/standalone/drakgw4
-rwxr-xr-xperl-install/standalone/drakpxe4
-rw-r--r--perl-install/standalone/drakvpn8
4 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index 1714a5dae..a7faf4617 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -29,7 +29,7 @@ use Data::Dumper;
local $_ = join '', @ARGV;
-$::direct = /-direct/;
+my $direct = /-direct/;
my $in = 'interactive'->vnew('su', 'default');
@@ -37,7 +37,7 @@ my $imagefile = "/root/drakx/replay_install.img";
-f $imagefile or $in->ask_warn(N("Error!"),
N("I can't find needed image file `%s'.", $imagefile), 1), quit_global($in, 0);
-$::direct or $in->ask_okcancel(N("Auto Install Configurator"),
+my $direct or $in->ask_okcancel(N("Auto Install Configurator"),
N("You are about to configure an Auto Install floppy. This feature is somewhat dangerous and must be used circumspectly.
With that feature, you will be able to replay the installation you've performed on this computer, being interactively prompted for some steps, in order to change their values.
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index b2ce377e9..0dfa138f8 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -40,7 +40,7 @@ $::isInstall and die "Not supported during install.\n";
local $_ = join '', @ARGV;
$::Wizard_pix_up = "drakgw.png";
-$::direct = /-direct/;
+my $direct = /-direct/;
my $sysconf_network = "/etc/sysconfig/network";
my $sysconf_dhcpd = "/etc/sysconfig/dhcpd";
@@ -187,7 +187,7 @@ step_ask_confirm:
undef $::Wizard_no_previous;
-$::direct or $in->ask_okcancel(N("Internet Connection Sharing"),
+$direct or $in->ask_okcancel(N("Internet Connection Sharing"),
N("You are about to configure your computer to share its Internet connection.
With that feature, other computers on your local network will be able to use this computer's Internet connection.
diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe
index 0fd55fe7b..c564995cb 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -32,7 +32,7 @@ use c;
$::isInstall and die "Not supported during install.\n";
$::Wizard_pix_up = "drakgw.png"; #- to change ? keep existing one, nobody will see (too late) ;-)
-$::direct = grep { /-direct/ } @ARGV;
+my $direct = grep { /-direct/ } @ARGV;
#
@@ -108,7 +108,7 @@ begin:
$::Wizard_no_previous = 1;
-$::direct or $in->ask_okcancel(N("Installation Server Configuration"),
+$direct or $in->ask_okcancel(N("Installation Server Configuration"),
N("You are about to configure your computer to install a PXE server as a DHCP server
and a TFTP server to build an installation server.
With that feature, other computers on your local network will be installable using this computer as source.
diff --git a/perl-install/standalone/drakvpn b/perl-install/standalone/drakvpn
index 4387dc889..ee64cf9c1 100644
--- a/perl-install/standalone/drakvpn
+++ b/perl-install/standalone/drakvpn
@@ -41,7 +41,7 @@ $::isInstall and die "Not supported during install.\n";
local $_ = join '', @ARGV;
$::Wizard_pix_up = "drakvpn.png";
-$::direct = /-direct/;
+my $direct = /-direct/;
my ($kernel_version) = c::kernel_version() =~ /(...)/;
log::l("[drakvpn] kernel_version $kernel_version");
@@ -146,7 +146,7 @@ step_ask_confirm:
undef $::Wizard_no_previous;
-$::direct or $in->ask_okcancel(N("Simple VPN setup."),
+$direct or $in->ask_okcancel(N("Simple VPN setup."),
N("You are about to configure your computer to use a VPN connection.
With this feature, computers on your local private network and computers
@@ -172,7 +172,7 @@ if ($kernel_version < 2.5) {
$proc_version = "ipsec native";
}
-$::direct or $in->ask_okcancel(N("Simple VPN setup."),
+$direct or $in->ask_okcancel(N("Simple VPN setup."),
N("VPN connection.
This program is based on the following projects:
@@ -185,7 +185,7 @@ This program is based on the following projects:
Please read AT LEAST the ipsec-howto docs
before going any further.",$ipsec_package)) or goto begin;
-$::direct or $in->ask_okcancel(N("Kernel module."),
+$direct or $in->ask_okcancel(N("Kernel module."),
N("The kernel need to have ipsec support.
You're running a %s kernel version.