Changeset 12883 in hybrid for branches

Timestamp:

Aug 24, 2014, 10:41:07 PM (10 years ago)

Author:

rick

Message:

Note to myself: Stop trying to re-invent the wheel and start reading the scripts. Somebody probaly hit the same issue before :-)

File:

• branches/releng-10/nanobsd/cfg/nanobsd.wleiden (modified) (3 diffs)

branches/releng-10/nanobsd/cfg/nanobsd.wleiden

@@ -27 +27 @@
 # a list of ports in the format like net/net-snmp
 NANO_PACKAGE_DIR=$NANO_CONF_DIR/../pkg/All
+NANO_PACKAGE_LIST="*"
+
 
 # Wireless Leiden ports from $WL_PORTSDIR are copied OVER $PORTSDIR
@@ -275 +277 @@
 }
 
-# Directly stolen from /usr/src/tools/tools/nanobsd/nanobsd.sh, and make sure
-# to source /etc/profile in chroot to get PKG_* included, for alternate installs
-cust_pkg () (
-        cp /etc/resolv.conf ${NANO_WORLDDIR}/etc
-        env ASSUME_ALWAYS_YES=yes pkg --chroot ${NANO_WORLDDIR} install ${PACKAGE_LIST}
-)
-
 
 # Prune no needed directories of image
@@ -357 +352 @@
 # XXX: Determine size before installing all find of additions to see how much
 # base we are actually using ## du -h -d 0
-customize_cmd cust_pkg
+customize_cmd cust_pkgng
 customize_cmd cust_install_files
 customize_cmd cust_ntpd