Skip to content

Commit 8cf6236

Browse files
committed
. 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 /
1 parent 59a4400 commit 8cf6236

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

tools/release.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
PATH=$PATH:/usr/local/bin
6-
75
XBIN=usr/xbin
86
SRC=src
97

10-
PACKAGEDIR=/usr/pkgsrc/packages
8+
PACKAGEDIR=/usr/pkgsrc/packages/`uname -r`/`uname -m`
119
# List of packages included on installation media
1210
PACKAGELIST=packages.install
1311
secs=`expr 32 '*' 64`
@@ -429,7 +427,7 @@ fi
429427
echo " * Counting files"
430428
extrakb=`du -s $RELEASEDIR/usr/install | awk '{ print $1 }'`
431429
find $RELEASEDIR/usr | fgrep -v /install/ | wc -l >$RELEASEDIR/.usrfiles
432-
find $RELEASEDIR -xdev | wc -l >$RELEASEDIR/.rootfiles
430+
find $RELEASEDIR -print -path $RELEASEDIR/usr -prune | wc -l >$RELEASEDIR/.rootfiles
433431

434432
echo " * Writing fstab"
435433
if [ "$USB" -ne 0 ]

0 commit comments

Comments
 (0)