. forget obsolete /usr/local/bin in $PATH

. update release.sh's notion of where packages are
  . update release.sh's notion of how many files are on root
    as -xdev won't work anymore to separate /usr from /
This commit is contained in:
Ben Gras 2010-09-20 11:07:53 +00:00
parent 08bf4dec4f
commit 300773cdca

View file

@ -2,12 +2,10 @@
set -e set -e
PATH=$PATH:/usr/local/bin
XBIN=usr/xbin XBIN=usr/xbin
SRC=src SRC=src
PACKAGEDIR=/usr/pkgsrc/packages PACKAGEDIR=/usr/pkgsrc/packages/`uname -r`/`uname -m`
# List of packages included on installation media # List of packages included on installation media
PACKAGELIST=packages.install PACKAGELIST=packages.install
secs=`expr 32 '*' 64` secs=`expr 32 '*' 64`
@ -429,7 +427,7 @@ fi
echo " * Counting files" echo " * Counting files"
extrakb=`du -s $RELEASEDIR/usr/install | awk '{ print $1 }'` extrakb=`du -s $RELEASEDIR/usr/install | awk '{ print $1 }'`
find $RELEASEDIR/usr | fgrep -v /install/ | wc -l >$RELEASEDIR/.usrfiles find $RELEASEDIR/usr | fgrep -v /install/ | wc -l >$RELEASEDIR/.usrfiles
find $RELEASEDIR -xdev | wc -l >$RELEASEDIR/.rootfiles find $RELEASEDIR -print -path $RELEASEDIR/usr -prune | wc -l >$RELEASEDIR/.rootfiles
echo " * Writing fstab" echo " * Writing fstab"
if [ "$USB" -ne 0 ] if [ "$USB" -ne 0 ]