Skip to content
Browse files

Update builder with a correct pkg.conf for use on DVD/USB

  • Loading branch information...
1 parent fd3f695 commit 3c6c1ac322f7514e0c016578a214ad3bf7d0805b @kmoore134 kmoore134 committed Nov 25, 2013
Showing with 6 additions and 6 deletions.
  1. +2 −2 scripts/9.freesbie.sh
  2. +4 −4 scripts/functions.sh
View
4 scripts/9.freesbie.sh
@@ -180,10 +180,10 @@ rc_halt "cp ${GITBRANCH}/build-files/conf/installcd-packages ${PDESTDIR9}/instal
rc_halt "mount -t devfs devfs ${PDESTDIR9}/dev"
# Bootstrap PKGNG
-rc_halt "pkg-static -c ${PDESTDIR9} add /mnt/pkg.txz"
+rc_halt "pkg-static -c ${PDESTDIR9} add /mnt/All/pkg.txz"
echo '#!/bin/sh
-cd /mnt
+cd /mnt/All
while read pkg
do
echo "Adding PACKAGE: $pkg"
View
8 scripts/functions.sh
@@ -242,12 +242,12 @@ create_pkg_conf()
create_installer_pkg_conf()
{
- cp ${PROGDIR}/pkg.conf ${PROGDIR}/tmp/pkg.conf
cp ${PROGDIR}/pkg-pubkey.cert ${PROGDIR}/tmp/pkg-pubkey.cert
- cat ${PROGDIR}/tmp/pkg.conf | grep -v "packagesite:" > ${PROGDIR}/tmp/pkg.conf.local
- mv ${PROGDIR}/tmp/pkg.conf.local ${PROGDIR}/tmp/pkg.conf
- echo "packagesite: file:///dist/packages" >> ${PROGDIR}/tmp/pkg.conf
+ echo "packagesite: file:///mnt" > ${PROGDIR}/tmp/pkg.conf
+ echo "PUBKEY: /mnt/pkg-pubkey.cert" >> ${PROGDIR}/tmp/pkg.conf
+ echo "PKG_CACHEDIR: /usr/local/tmp" >> ${PROGDIR}/tmp/pkg.conf
+
}
# Copy the ISO package files to a new location

0 comments on commit 3c6c1ac

Please sign in to comment.
Something went wrong with that request. Please try again.