From b43f2a90888d6bc4f36a808b471aad18662566f7 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Fri, 3 Oct 2003 15:20:15 +0000 Subject: fixed important glitches about oem-theme.rpm not capable of being copied --- perl-install/install_steps.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/install_steps.pm') diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 58a33b68d..fbfd20101 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -329,6 +329,7 @@ sub beforeInstallPackages { substInFile { s/%_excludedocs.*//; $_ .= "%_excludedocs yes\n" if eof && $o->{excludedocs} } "$o->{prefix}/etc/rpm/macros"; #- add oem theme if the files exists. + mkdir "$o->{prefix}$_" foreach qw(/usr /usr/share); install_any::getAndSaveFile("Mandrake/base/oem-theme.rpm", "$o->{prefix}/usr/share/oem-theme.rpm"); } @@ -1005,7 +1006,7 @@ risk! #------------------------------------------------------------------------------ sub hasNetwork { my ($o) = @_; - $o->{netcnx}{type} && $o->{netc}{NETWORKING} ne 'no' and return 1; + $o->{netcnx}{type} && $o->{netc}{NETWORKING} ne 'no' && $o->{netc}{DHCP} ne 'yes' and return 1; log::l("no network seems to be configured for internet ($o->{netcnx}{type},$o->{netc}{NETWORKING})"); 0; } -- cgit v1.2.1