summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-12 12:07:35 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-12 12:07:35 +0000
commit5a491e6da415d48b0a8b8387990052b7a2d832b0 (patch)
tree3006526e5013509c488bbedf32f48c645d071e98
parentf5ef17e3abbff1b32dee5034ee03be196b00f485 (diff)
downloaddrakx-backup-do-not-use-5a491e6da415d48b0a8b8387990052b7a2d832b0.tar
drakx-backup-do-not-use-5a491e6da415d48b0a8b8387990052b7a2d832b0.tar.gz
drakx-backup-do-not-use-5a491e6da415d48b0a8b8387990052b7a2d832b0.tar.bz2
drakx-backup-do-not-use-5a491e6da415d48b0a8b8387990052b7a2d832b0.tar.xz
drakx-backup-do-not-use-5a491e6da415d48b0a8b8387990052b7a2d832b0.zip
draknet is drakconnect now
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/printerdrake.pm13
2 files changed, 7 insertions, 8 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cca7d9552..6d2ee0030 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -603,7 +603,7 @@ sub configureNetwork {
output $f, "\nif$_ eth0\n";
chmod 0755, $f;
}
- output "$o->{prefix}/etc/sysconfig/network-scripts/net_cnx_pg", "\n/usr/sbin/draknet\n";
+ output "$o->{prefix}/etc/sysconfig/network-scripts/net_cnx_pg", "\n/usr/sbin/drakconnet\n";
}
}
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 19aabd9b4..5e8054325 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -1919,11 +1919,11 @@ sub check_network {
$in->set_help('checkNetwork') if $::isInstall;
- # First check: Does /etc/sysconfig/network-scripts/draknet_conf exist
- # (otherwise the network is not configured yet and draknet has to be
+ # First check: Does /etc/sysconfig/network-scripts/drakconnet_conf exist
+ # (otherwise the network is not configured yet and drakconnet has to be
# started)
- if (!printer::files_exist("/etc/sysconfig/network-scripts/draknet_conf")) {
+ if (!printer::files_exist("/etc/sysconfig/network-scripts/drakconnet_conf")) {
my $go_on = 0;
while (!$go_on) {
my $choice = _("Configure the network now");
@@ -1942,9 +1942,9 @@ sub check_network {
$in->{lang} eq "fr_FR" &&
$in->{keyboard} eq "fr", 0);
} else {
- system("/usr/sbin/draknet");
+ system("/usr/sbin/drakconnet");
}
- if (printer::files_exist("/etc/sysconfig/network-scripts/draknet_conf")) {
+ if (printer::files_exist("/etc/sysconfig/network-scripts/drakconnet_conf")) {
$go_on = 1;
}
} else {
@@ -2556,8 +2556,7 @@ sub main {
$::isWizard = 1;
# Wizard welcome screen
$::Wizard_no_previous = 1;
- undef $::Wizard_no_cancel;
- undef $::Wizard_finished;
+ undef ($::Wizard_no_cancel, $::Wizard_finished);
wizard_welcome($printer, $in) or do {
wizard_close($in, 0);
next;