From 2400f927453802e0b652bcc8dee9544d4ada665c Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Wed, 27 Jun 2018 09:36:35 -0400 Subject: [PATCH] Allow userland repo to exist anywhere in the fs --- build_zfs_send.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_zfs_send.sh b/build_zfs_send.sh index 3b0418e..c6aee82 100755 --- a/build_zfs_send.sh +++ b/build_zfs_send.sh @@ -31,6 +31,7 @@ fail() { PUBLISHER=unleashed PKGURL=${PKGURL-/usr/nightly/packages/i386/nightly/repo.redist} +PKGUSERLAND=${PKGURL-/ws/oi-userland/i386/repo} : ${BZIP2:=bzip2} ZROOT=rpool OUT= @@ -68,7 +69,7 @@ else zfs create $ZROOT/$name || fail "zfs create" MP=`zfs get -H mountpoint $ZROOT/$name | awk '{print $3}'` pkg image-create -F -p $PUBLISHER=$PKGURL $MP || fail "image-create" - pkg -R $MP set-publisher --non-sticky -p /ws/oi-userland/i386/repo + pkg -R $MP set-publisher --non-sticky -p $PKGUSERLAND pkg -R $MP install osnet-redistributable developer/opensolaris/osnet $USERLAND_PACKAGES || fail 'install' zfs snapshot $ZROOT/$name@entire fi -- 2.11.4.GIT