summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-04-16 15:46:31 +0000
committerFrancois Pons <fpons@mandriva.com>2002-04-16 15:46:31 +0000
commit9fd4ad123f5bcf9cfc1280d9dd79f51ad9ac2a52 (patch)
treea116b16c16f15f5b41c133d489790bf1839e5511
parent2d4331ab3efc9e10132b553024b5bf2bb380b32c (diff)
downloaddrakx-9fd4ad123f5bcf9cfc1280d9dd79f51ad9ac2a52.tar
drakx-9fd4ad123f5bcf9cfc1280d9dd79f51ad9ac2a52.tar.gz
drakx-9fd4ad123f5bcf9cfc1280d9dd79f51ad9ac2a52.tar.bz2
drakx-9fd4ad123f5bcf9cfc1280d9dd79f51ad9ac2a52.tar.xz
drakx-9fd4ad123f5bcf9cfc1280d9dd79f51ad9ac2a52.zip
fixed stupid error.
-rwxr-xr-xrescue/tree/etc/oem7
1 files changed, 6 insertions, 1 deletions
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index 26f565a91..e698b16b3 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -530,7 +530,6 @@ system "rpm", "--root", "/mnt", "--initdb";
#- keep in mind all the rpm files available (according to hdlists).
my (%files, %rpms);
-#- copy and install from each cd image.
require packdrake;
foreach my $medium (@media) {
my $packer = new packdrake("/cdrom/Mandrake/base/$medium->{hdlist}");
@@ -540,7 +539,10 @@ foreach my $medium (@media) {
$files{$fullname} = $file;
$rpms{$file} = $medium->{rpmsdir};
}
+}
+#- copy and install from each cd image.
+foreach my $medium (@media) {
while ($cd && ! -d "/cdrom/$medium->{rpmsdir}") {
system "unmount", "/dev/$cd";
system "eject", "/dev/$cd";
@@ -552,6 +554,7 @@ foreach my $medium (@media) {
print "Copying packages from medium labeled \"$medium->{descr}\" to hard disk\n";
system "mkdir", "-p", "/hd/$medium->{rpmsdir}";
foreach my $pkg (@{$packages->{depslist}}) {
+ $files{rpm_fullname($pkg)} or next;
$pkg->{closure} && !$pkg->{selected} or next;
my $file = "/cdrom/$medium->{rpmsdir}/" . $files{rpm_fullname($pkg)};
if (-e $file) {
@@ -563,6 +566,7 @@ foreach my $medium (@media) {
print "Installing packages from medium labeled \"$medium->{descr}\"\n";
if (my $pkg = pkgs::packageByName($packages, 'glibc')) { #- HACK FOR GLIBC
+ $files{rpm_fullname($pkg)} or die "no glibc package found";
if (delete $pkg->{selected}) {
my $file = "/cdrom/$medium->{rpmsdir}/" . $files{rpm_fullname($pkg)};
if (-e $file) {
@@ -574,6 +578,7 @@ foreach my $medium (@media) {
}
my @files;
foreach my $pkg (@{$packages->{depslist}}) {
+ $files{rpm_fullname($pkg)} or next;
$pkg->{selected} or next;
my $file = "/cdrom/$medium->{rpmsdir}/" . $files{rpm_fullname($pkg)};
if (-e $file) {