restore pkgin_cd

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

Change-Id: Ia4b7588975c2ddf630fa1c510715d82755f67f1e
This commit is contained in:
Ben Gras 2014-09-13 16:50:30 +02:00
parent a875715bb4
commit 43eceae54c
2 changed files with 2 additions and 2 deletions

View file

@ -739,7 +739,7 @@ fi
chroot /mnt update_bootcfg chroot /mnt update_bootcfg
# Save name of CD drive # 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 echo "cddrive=$cddrive" >>/mnt/usr/etc/rc.package
bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`" bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`"

View file

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