From 72eb2bd1e5e0408bff0112ad74f224ba768abf42 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 6 Apr 2017 23:00:59 +0000 Subject: [PATCH] makeRootfs.sh: adapted to install filesystem port before the rest --- makeRootfs.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/makeRootfs.sh b/makeRootfs.sh index 3a40540..af31821 100755 --- a/makeRootfs.sh +++ b/makeRootfs.sh @@ -47,7 +47,8 @@ checkVars() { TMPDIR="$(cd $TMPDIR; pwd)" PKGDIR="$(cd $PKGDIR; pwd)" RELEASE_DIR="$(cd $RELEASE_DIR; pwd)" - [ -z "$PACKAGES" ] && PACKAGES="$(find $PKGDIR -type f -name '*#*pkg.tar.*')" + [ -z "$PACKAGES" ] && PACKAGES="$(find $PKGDIR -type f -name '*#*pkg.tar.*' ! -name 'filesystem#*pkg.tar.*')" + [ -z "$FILESYSTEM" ] && FILESYSTEM="$(find $PKGDIR -type f -name 'filesystem#*pkg.tar.*')" } # global variables @@ -65,6 +66,9 @@ sudo chmod 0444 $TMPDIR/var/lib/pkg/db pkgnum=0 echo "+ Installing packages..." +echo "+ Installing filesystem port" +sudo pkgadd -r $TMPDIR $FILESYSTEM || msgError "failed to install $FILESYSTEM package" + for pkg in $PACKAGES; do sudo pkgadd -r $TMPDIR $pkg || msgError "failed to install $pkg" let pkgnum=$pkgnum+1 -- 2.26.2