restore pkgin_cd

. make release.sh put packages on the cd
	. make setup script produce a better rc.package file

Change-Id: Ia4b7588975c2ddf630fa1c510715d82755f67f1e

minix/commands/setup/setup.sh

@@ -739,7 +739,7 @@ fi
 chroot /mnt update_bootcfg
 
 # Save name of CD drive
-cddrive="`mount | grep /usr | awk '{ print $1 }' | sed 's/p.*//'`"
+cddrive="`mount | fgrep ' /usr ' | awk '{ print $1 }' | sed 's/p.*//'`"
 echo "cddrive=$cddrive" >>/mnt/usr/etc/rc.package
 
 bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`"

releasetools/release.functions

@@ -135,7 +135,7 @@ copy_local_packages()
 				  exit 1
 			      fi
 	
-			      if [ "`wc -l $indexname`" -lt 3 ]
+			      if [ "`wc -l <$indexname`" -lt 3 ]
 			      then	$indexname is too short.
 				  rm $indexname
 				  exit 1