diff options
| -rw-r--r-- | perl-install/ChangeLog | 6 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 10beedee5..3a461663b 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,9 @@ +2000-05-03 François Pons <fpons@mandrakesoft.com> + + * install_steps.pm: updated min size, fixed kppprc generation. + * install_any.pm: make sure postinstall-rpm is here before + erasing (avoid error on reboot only). + 2000-05-02 Pixel <pixel@mandrakesoft.com> * raid.pm (format_part): don't call raid::make if part is already diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 7f88ead98..2ef837916 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -175,7 +175,7 @@ sub setup_postinstall_rpms($$) { commands::cp((map { "/tmp/rhimage/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms); } sub clean_postinstall_rpms() { - $postinstall_rpms and commands::rm('-rf', $postinstall_rpms); + $postinstall_rpms and -d $postinstall_rpms and commands::rm('-rf', $postinstall_rpms); } #-###################################################################################### diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 49d6ff677..bf5e7d6f1 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -24,7 +24,11 @@ use network; use any; use fs; -$minAvailableSize = 5 * sqr(1024); +#- make sure of this place to be available for installation, this could help a lot. +#- currently doing a very small install use 36Mb of postinstall-rpm, but installing +#- these packages may eat up to 90Mb (of course not all the server may be installed!). +#- 50mb may be a good choice to avoid almost all problem of insuficient space left... +$minAvailableSize = 50 * sqr(1024); @filesToSaveForUpgrade = qw( /etc/ld.so.conf /etc/fstab /etc/hosts /etc/conf.modules ); @@ -551,7 +555,7 @@ END local *F; open F, ">$secrets" or die "Can't open $secrets: $!"; print F @l; - } else { + } else { local *F; open F, ">>$secrets" or die "Can't open $secrets: $!"; print F "$toreplace{login} ppp0 \"$toreplace{passwd}\"\n"; @@ -561,7 +565,8 @@ END } #- CHAP is not supported by initscripts, need patching before doing more on that here! #-install_any::template2userfile($o->{prefix}, "$ENV{SHARE_PATH}/kppprc.in", ".kde/share/config/kppprc", 1, %toreplace); - install_any::template2userfile($o->{prefix}, "$ENV{SHARE_PATH}/kppprc.in", "$o->{prefix}/usr/share/config/kppprc", %toreplace); + commands::mkdir_("-p", "$o->{prefix}/usr/share/config"); + template2file("$ENV{SHARE_PATH}/kppprc.in", "$o->{prefix}/usr/share/config/kppprc", %toreplace); miscellaneousNetwork($o); } |