summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-09-01 05:01:18 +0000
committerdamien <damien@mandriva.com>2000-09-01 05:01:18 +0000
commit66fe2e11ec03bb07eebbe114bc544b8c3b1a2735 (patch)
tree890d23a43cc881061a7ad4caa9370e475ddf1cb1
parent9e6f0a8dc550dcbb0025b6c78e9938dade9831af (diff)
downloaddrakx-66fe2e11ec03bb07eebbe114bc544b8c3b1a2735.tar
drakx-66fe2e11ec03bb07eebbe114bc544b8c3b1a2735.tar.gz
drakx-66fe2e11ec03bb07eebbe114bc544b8c3b1a2735.tar.bz2
drakx-66fe2e11ec03bb07eebbe114bc544b8c3b1a2735.tar.xz
drakx-66fe2e11ec03bb07eebbe114bc544b8c3b1a2735.zip
a
-rw-r--r--perl-install/network.pm2
-rwxr-xr-xperl-install/standalone/draknet5
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 8aea39a12..7b9558e44 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -352,7 +352,7 @@ sub configureNetworkIntf {
delete $intf->{NETWORK};
delete $intf->{BROADCAST};
my @fields = qw(IPADDR NETMASK);
- $in->set_help('configureNetworkIP');
+ $::isStandalone or $in->set_help('configureNetworkIP');
$in->ask_from_entries_ref(_("Configuring network device %s", $intf->{DEVICE}),
($::isStandalone ? '' : _("Configuring network device %s", $intf->{DEVICE}) . "\n\n") .
_("Please enter the IP configuration for this machine.
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 2cb20d3c9..09f091d48 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-use lib qw (/usr/lib/libDrakX);
+use lib qw (..);#(/usr/lib/libDrakX);
use interactive;
use netconnect;
@@ -46,6 +46,5 @@ $::isStandalone = 1;
my $in = vnew interactive('su');
-netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia", sub { system("urpmi --auto XFree86-$_[0]") });
-
+netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia");
$in->exit(0);