summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-12 15:52:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-12 15:52:30 +0000
commit63068a92b352e041523c7d5beae85eac3d584495 (patch)
treeeebe6c87c3aa54b9ee786a3772ac7b8c3674a62f
parent062c493f675e9682ca15f1838af0c0c6d7e1a4b7 (diff)
downloaddrakx-63068a92b352e041523c7d5beae85eac3d584495.tar
drakx-63068a92b352e041523c7d5beae85eac3d584495.tar.gz
drakx-63068a92b352e041523c7d5beae85eac3d584495.tar.bz2
drakx-63068a92b352e041523c7d5beae85eac3d584495.tar.xz
drakx-63068a92b352e041523c7d5beae85eac3d584495.zip
used the ip from stage1 instead of using IPADDR which is not given for dhcp
for auto_install file (as asked by Michael Riss)
-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 0525ee8a2..af9c22473 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -455,8 +455,9 @@ sub main {
#- done after module dependencies are loaded for "vfat depends on fat"
if ($::auto_install) {
if ($::auto_install =~ /-IP(\.pl)?$/) {
- my $ip = join('', map { sprintf "%02X", $_ } split '\.', $o->{intf}{IPADDR});
- $::auto_install =~ s/-IP(\.pl)?$/-$ip$1/;
+ my ($ip) = cat_('/tmp/stage1.log') =~ /configuring device (?!lo)\S+ ip: (\S+)/;
+ my $normalized_ip = join('', map { sprintf "%02X", $_ } split('\.', $ip));
+ $::auto_install =~ s/-IP(\.pl)?$/-$normalized_ip$1/;
}
require install_steps_auto_install;
eval { $o = $::o = install_any::loadO($o, $::auto_install) };