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-backup-do-not-use-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar
drakx-backup-do-not-use-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar.gz
drakx-backup-do-not-use-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar.bz2
drakx-backup-do-not-use-90b3afaf4be5e37c84b74678178eaecabbd069c8.tar.xz
drakx-backup-do-not-use-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() {