From 91228fdcfc80518e540687a6b2988024ca77e55a Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 6 Nov 2000 15:54:17 +0000
Subject: copy RPMS and base directories, check rpm file presence before trying
 to install.

---
 rescue/tree/etc/oem | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rescue/tree')

diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index ea715aae2..fc85a3de7 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -47,7 +47,7 @@ mkdir /mnt; mount -t ext2 $hd$root /mnt
 echo "Copying installation on hard drive"
 mkdir /hd/Mandrake
 cp -a /boot /cdrom/boot /hd
-cp -a /cdrom/Mandrake/mdkinst /hd/Mandrake
+cp -a /cdrom/Mandrake /hd/Mandrake
 
 echo "Installing packages"
 export DURING_INSTALL=1
@@ -57,7 +57,7 @@ for i in /var/lib/rpm /proc ; do mkdir -p /mnt$i; done
 mount -t proc proc /mnt/proc
 rpm --root /mnt --initdb
 for i in `perl -pe 's/ .*//' /cdrom/Mandrake/base/depslist.ordered`; do
-    rpm --root /mnt -ivh /cdrom/Mandrake/RPMS/$i.*.rpm --nodeps --force
+    [ -e $i.*.rpm ] && rpm --root /mnt -ivh /cdrom/RPMS/$i.*.rpm --nodeps --force
 done
 
 echo
-- 
cgit v1.2.1