summaryrefslogtreecommitdiffstats
path: root/rescue/tree
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-11-06 15:54:17 +0000
committerFrancois Pons <fpons@mandriva.com>2000-11-06 15:54:17 +0000
commit91228fdcfc80518e540687a6b2988024ca77e55a (patch)
treefa7bc9b3eb3a4ebfed738834e0acd1a5b75cdd9e /rescue/tree
parent54411682f9d76a9370b22c1c9e8966b8033373c0 (diff)
downloaddrakx-91228fdcfc80518e540687a6b2988024ca77e55a.tar
drakx-91228fdcfc80518e540687a6b2988024ca77e55a.tar.gz
drakx-91228fdcfc80518e540687a6b2988024ca77e55a.tar.bz2
drakx-91228fdcfc80518e540687a6b2988024ca77e55a.tar.xz
drakx-91228fdcfc80518e540687a6b2988024ca77e55a.zip
copy RPMS and base directories, check rpm file presence before trying to install.
Diffstat (limited to 'rescue/tree')
-rwxr-xr-xrescue/tree/etc/oem4
1 files changed, 2 insertions, 2 deletions
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