summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-11-07 14:02:17 +0000
committerFrancois Pons <fpons@mandriva.com>2000-11-07 14:02:17 +0000
commit7cd05dd779309e988c64039e5f7eb1af40ca3720 (patch)
tree0ebd1b534b1799322294b72efa03666dc0306d26
parent758e0db8ebf3b62a0d5bdd20740c310d28a58e1e (diff)
downloaddrakx-7cd05dd779309e988c64039e5f7eb1af40ca3720.tar
drakx-7cd05dd779309e988c64039e5f7eb1af40ca3720.tar.gz
drakx-7cd05dd779309e988c64039e5f7eb1af40ca3720.tar.bz2
drakx-7cd05dd779309e988c64039e5f7eb1af40ca3720.tar.xz
drakx-7cd05dd779309e988c64039e5f7eb1af40ca3720.zip
fixe for using standard CD for oem install by using closurepkgs.
-rwxr-xr-xrescue/tree/etc/oem11
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