diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-06-19 16:19:57 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-06-19 16:19:57 +0000 |
| commit | 301e6e30d2d70e1454ca85c872773e6652b0f743 (patch) | |
| tree | a6c8c93681dbd7084494dd5a796ad182926b9462 | |
| parent | 938983fb49d353314ad046b9f2ccc3c7ce6711c5 (diff) | |
| download | drakx-301e6e30d2d70e1454ca85c872773e6652b0f743.tar drakx-301e6e30d2d70e1454ca85c872773e6652b0f743.tar.gz drakx-301e6e30d2d70e1454ca85c872773e6652b0f743.tar.bz2 drakx-301e6e30d2d70e1454ca85c872773e6652b0f743.tar.xz drakx-301e6e30d2d70e1454ca85c872773e6652b0f743.zip | |
- auto_install:
o ensure /etc/resolv.conf is configured in /mnt for network installs
(reported by guillomovitch on freenode #mandrivafr)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index afa95f705..55201acaf 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - auto_install: o allow "automatic=met:http,ser:server,dir:/pub/dir kickstart=/pub/auto_inst.cfg" to get http://server/pub/auto_inst.cfg (#31474) + o ensure /etc/resolv.conf is configured in /mnt for network installs - add /etc/mke2fs.conf in order to format ext3fs with 4k blocks (#27377) - diskdrake o fix 1.9TB displayed as 1TB diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 4ebeec8e0..c420d98ef 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -361,6 +361,12 @@ sub beforeInstallPackages { require network::network; network::network::add2hosts("localhost", "127.0.0.1"); + #- resolv.conf will be modified at boot time + #- the following will ensure we have a working DNS during install + if (-e "/etc/resolv.conf" && ! -e "$::prefix/etc/resolv.conf") { + cp_af("/etc/resolv.conf", "$::prefix/etc"); + } + log::l("setting excludedocs to $o->{excludedocs}"); substInFile { s/%_excludedocs.*//; $_ .= "%_excludedocs yes\n" if eof && $o->{excludedocs} } "$::prefix/etc/rpm/macros"; |