summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-21 17:27:29 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-21 17:27:29 +0000
commit90b3afaf4be5e37c84b74678178eaecabbd069c8 (patch)
treec1336f3424e7b549bca89e133a3ca9084355634b
parent51986d94a7f8e51912b4cc2c6e742ed489bceb7e (diff)
downloaddrakx-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar
drakx-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar.gz
drakx-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar.bz2
drakx-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar.xz
drakx-90b3afaf4be5e37c84b74678178eaecabbd069c8.zip
avoid detecting plip for live upgrade.
-rw-r--r--perl-install/detect_devices.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 8438897b8..5e0fd1441 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -206,7 +206,7 @@ sub getNet() {
# }
# /ippp/ and run_program::rooted("", "/sbin/isdnctrl delif $_") foreach @netdevices;
# @a;
- grep { !($::isStandalone && /plip/) && c::hasNetDevice($_) } @netdevices;
+ grep { !(($::isStandalone || $::live) && /plip/) && c::hasNetDevice($_) } @netdevices;
}
#sub getISDN() {
ve to be redefined here to
-# get correct namespace (drakconf instead of libDrakX)
-# (This version is now UTF8 compliant - Sg 2001-08-18)
-#-------------------------------------------------------------
-
-#sub _ {
-# my $s = shift @_; my $t = translate($s);
-# sprintf $t, @_;
-#}
-
-#sub translate {
-# my ($s) = @_;
-# $s ? c::dgettext('libDrakX', $s) : '';
-#}
-
-if ($::isEmbedded) {
- print "EMBED\n";
- print "XID : $::XID\n";
- print "CCPID : $::CCPID\n";
-}
-
$in = 'interactive'->vnew('su', 'default');
local $_ = join '', @ARGV;
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index a8c37c240..740994a63 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -35,26 +35,6 @@ use my_gtk qw(:helpers :wrappers);
use ugtk qw(:helpers);
use Data::Dumper;
-#-------------------------------------------------------------
-# i18n routines
-# IMPORTANT: next two routines have to be redefined here to
-# get correct namespace (drakconf instead of libDrakX)
-# (This version is now UTF8 compliant - Sg 2001-08-18)
-#-------------------------------------------------------------
-
-#{
-# no warnings;
-# sub _ {
-# my $s = shift @_; my $t = translate($s);
-# sprintf $t, @_;
-# }
-
-# no warnings;
-# sub translate {
-# my ($s) = @_;
-#$s ? c::dgettext('libDrakX', $s) : '';
-# }
-#}
$::isInstall and die "Not supported during install.\n";