fixe for using standard CD for oem install by using closurepkgs.

1 files changed, 8 insertions, 3 deletions

diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index 9015c3987..1cf099d3e 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -45,7 +45,12 @@ mkdir -p /hd ; mount -t ext2 $hd$inst /hd
 mkdir -p /mnt; mount -t ext2 $hd$root /mnt
 
 echo "Copying installation on hard drive"
-cp -a /boot /cdrom/boot /cdrom/Mandrake /hd
+cp -a /boot /cdrom/boot /hd
+mkdir -p /hd/Mandrake /hd/Mandrake/RPMS
+cp -a /cdrom/Mandrake/base /cdrom/Mandrake/mdkinst /hd/Mandrake
+for i in `closurepkgs /hd/Mandrake/base/depslist.ordered /hd/Mandrake/base/compssList | grep C: | cut -d: -f2`; do
+    [ -e /cdrom/Mandrake/RPMS/$i.*.rpm ] && cp -a /cdrom/Mandrake/RPMS/$i.*.rpm /hd/Mandrake/RPMS
+done
 
 echo "Installing packages"
 export DURING_INSTALL=1
@@ -56,8 +61,8 @@ for i in /etc /var/lib/rpm /proc ; do mkdir -p /mnt$i; done
 mount -t proc proc /mnt/proc
 rpm --root /mnt --initdb
 touch /mnt/etc/fstab
-for i in `perl -pe 's/ .*//' /cdrom/Mandrake/base/depslist.ordered`; do
-    [ -e /cdrom/RPMS/$i.*.rpm ] && rpm --root /mnt -ivh /cdrom/RPMS/$i.*.rpm --nodeps --force
+for i in `closurepkgs /hd/Mandrake/base/depslist.ordered /hd/Mandrake/base/compssList | grep I: | cut -d: -f2`; do
+    [ -e /cdrom/Mandrake/RPMS/$i.*.rpm ] && rpm --root /mnt -ivh /cdrom/Mandrake/RPMS/$i.*.rpm --nodeps --force
 done
 umount /mnt/proc