summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-06 14:07:25 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-06 14:07:25 +0000
commit658f028abc50486955e99d7083cdff8e07088e6f (patch)
tree7c999fb7c9a77df0805fbf3268fdd5e3351894df /perl-install/install2.pm
parent363aab7a71a0b505c780b763b22bcd5131995382 (diff)
downloaddrakx-backup-do-not-use-658f028abc50486955e99d7083cdff8e07088e6f.tar
drakx-backup-do-not-use-658f028abc50486955e99d7083cdff8e07088e6f.tar.gz
drakx-backup-do-not-use-658f028abc50486955e99d7083cdff8e07088e6f.tar.bz2
drakx-backup-do-not-use-658f028abc50486955e99d7083cdff8e07088e6f.tar.xz
drakx-backup-do-not-use-658f028abc50486955e99d7083cdff8e07088e6f.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 60b0ca166..d99fd741d 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -370,7 +370,7 @@ sub doInstallStep {
}
#------------------------------------------------------------------------------
sub miscellaneous {
- $o->miscellaneous($_[0]);
+ $o->miscellaneous($_[0]);
addToBeDone {
setVarsInSh("$o->{prefix}/etc/sysconfig/system", {
@@ -402,7 +402,7 @@ sub configureNetwork {
add2hash($o->{netc}, network::read_conf("$o->{prefix}/etc/sysconfig/network")) if -r "$o->{prefix}/etc/sysconfig/network";
add2hash($o->{netc}, network::read_resolv_conf("$o->{prefix}/etc/resolv.conf")) if -r "$o->{prefix}/etc/resolv.conf";
foreach (all("$o->{prefix}/etc/sysconfig/network-scripts")) {
- if (/ifcfg-(\w+)/) {
+ if (/ifcfg-(\w+)/ && $1 !~ /^ppp/) {
push @{$o->{intf}}, { getVarsFromSh("$o->{prefix}/etc/sysconfig/network-scripts/$_") };
}
}
@@ -624,6 +624,7 @@ sub main {
}
$::o = $o = $o_;
+ #- get stage1 network configuration if any.
$o->{netc} = network::read_conf("/tmp/network");
if (my ($file) = glob_('/tmp/ifcfg-*')) {
log::l("found network config file $file");