restore pkgin_cd

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

Change-Id: Ia4b7588975c2ddf630fa1c510715d82755f67f1e

diff --git a/minix/commands/setup/setup.sh b/minix/commands/setup/setup.sh
index bf662f493632ad3da60eb820fb904b975d4d5a60..0fa2501f1e5e58b04e9511dd89c52ddaf3bba6c7 100644 (file)
--- a/minix/commands/setup/setup.sh
+++ b/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'`"

diff --git a/releasetools/release.functions b/releasetools/release.functions
index 151b9f98374abae0b0de48817641b9019bb6bf74..fde32d4a39409cfd4f30416082d18f966c3587bd 100644 (file)
--- a/releasetools/release.functions
+++ b/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