From: Ben Gras <ben@minix3.org>
Date: Sat, 13 Sep 2014 14:50:30 +0000 (+0200)
Subject: restore pkgin_cd
X-Git-Tag: v3.3.0~2
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/doc/weatherstation.js?a=commitdiff_plain;h=refs%2Fchanges%2F30%2F2830%2F1;p=minix.git

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 bf662f493..0fa2501f1 100644
--- 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 151b9f983..fde32d4a3 100644
--- 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