*** empty log message ***

diff --git a/commands/scripts/packme.sh b/commands/scripts/packme.sh
index 08f84711e7b5f14397800e4327131990c9dca342..ba6fe0404374db5a2f46e4b5d2d43a020a02924e 100644 (file)
--- a/commands/scripts/packme.sh
+++ b/commands/scripts/packme.sh
@@ -31,6 +31,6 @@ then  pack=${cddrive}p2
                done
        else    echo "CD mount failed - skipping CD packages."
        fi
-else   echo "Don't know where the install CD is.
+else   echo "Don't know where the install CD is."
 fi
 

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index d2f6ed9e305688f922998420b0ec60b0287d8651..033561c6ff1f7ce140451f98fa51cdf616211668 100755 (executable)
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -618,9 +618,8 @@ edparams /dev/$root "rootdev=$root; ramimagedev=$root; $disable; minix(1,Start M
 pfile="/mnt/src/tools/fdbootparams"
 echo "rootdev=$root; ramimagedev=$root; $disable; save" >$pfile
 # Save name of CD drive
-echo "cddrive=`mount | grep usr | awk '{ print $1 }' | sed 's/p.*//'`" >>/mnt/etc/rc.package
-
-sync
+cddrive="`mount | grep usr | awk '{ print $1 }' | sed 's/p.*//'`" 
+echo "cddrive=$cddrive" >>/mnt/etc/rc.package
 
 bios="`echo $primary | sed 's/d./dX/g'`"
 
@@ -642,9 +641,11 @@ echo "Install is done. Running postinstall script.."
 
 # Now chroot-mount the new system and run the postinstall script
 umount /dev/$usr || exit 1
+umount /dev/${cddrive}p2
 mount /dev/$root /mnt || exit 1
 mount /dev/$usr /mnt/usr || exit 1
 chroot /mnt '/bin/sh /usr/src/commands/scripts/postinstall.sh'
+mount -r /dev/${cddrive}p2 /usr
 
 echo "Postinstall script done. Saving random data.."
 dd if=/dev/random of=/mnt/usr/adm/random.dat bs=1024 count=1