summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-10-03 15:20:15 +0000
committerFrancois Pons <fpons@mandriva.com>2003-10-03 15:20:15 +0000
commitb43f2a90888d6bc4f36a808b471aad18662566f7 (patch)
tree7c2a54f0f181406de3b4f7aa0bafb43a4375ae2b
parenta4bfa7746af6c2994c59ed52b246e67c82e9dfa2 (diff)
downloaddrakx-backup-do-not-use-b43f2a90888d6bc4f36a808b471aad18662566f7.tar
drakx-backup-do-not-use-b43f2a90888d6bc4f36a808b471aad18662566f7.tar.gz
drakx-backup-do-not-use-b43f2a90888d6bc4f36a808b471aad18662566f7.tar.bz2
drakx-backup-do-not-use-b43f2a90888d6bc4f36a808b471aad18662566f7.tar.xz
drakx-backup-do-not-use-b43f2a90888d6bc4f36a808b471aad18662566f7.zip
fixed important glitches about oem-theme.rpm not capable of being copied
-rw-r--r--perl-install/install_steps.pm3
1 files changed, 2 insertions, 1 deletions
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;
}