release.sh: minor -L fix

diff --git a/tools/release.sh b/tools/release.sh
index 7301c2aa16ee22da7ffd10e32846c7361b544d30..8da1ca0ca8d5c2b5149e44846491ba357014fa6c 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -123,7 +123,8 @@ do
                ;;
        l)      PKG_ADD_URL=file://$PACKAGEDIR/All
                ;;
-       L)      PACKAGEURL="$OPTARG"
+       L)      PKG_ADD_URL="$OPTARG"
+               CUSTOM_PACKAGES=1
                ;;
        esac
 done
@@ -255,9 +256,13 @@ chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin sh -x /usr/$SRC/tools/chrootmake.sh
 
 for p in $PREINSTALLED_PACKAGES
 do     echo " * Pre-installing: $p from $PKG_ADD_URL"
-    $PKG_ADD -P $RELEASEDIR $PKG_ADD_URL/$p
+    $PKG_ADD -f -P $RELEASEDIR $PKG_ADD_URL/$p
 done
 
+if [ "$CUSTOM_PACKAGES" ]
+then   echo $PKG_ADD_URL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf
+fi
+
 echo " * Chroot build"
 chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1
 # Copy built images for cd booting