d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hoist CR convenience function up from dhcpd config and use

Browse Source 
appropriately in nanobsd.sh. Also create CR0 for a errors allowed
version.
This commit is contained in:
Warner Losh 2014-04-24 02:02:46 +00:00
parent af5905f482
commit 0d87af1981
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/tools/nanobsd/dhcpd/common
View File

@ -156,11 +156,6 @@ WITHOUT_RCS=true
NANO_PACKAGE_ONLY=1
CR()
{
chroot ${NANO_WORLDDIR} /bin/sh -exc "$*"
}
# install a package from a pre-built binary
do_add_pkg ()
{

32
tools/tools/nanobsd/nanobsd.sh
View File

@ -177,6 +177,18 @@ SRCCONF=${SRCCONF:=/dev/null}
#
#######################################################################
# run in the world chroot, errors fatal
CR()
{
chroot ${NANO_WORLDDIR} /bin/sh -exc "$*"
}
# run in the world chroot, errors not fatal
CR0()
{
chroot ${NANO_WORLDDIR} /bin/sh -c "$*" || true
}
nano_cleanup ( ) (
if [ $? -ne 0 ]; then
echo "Error encountered. Check for errors in last log file." 1>&2
@ -748,8 +760,7 @@ cust_pkg () (
# Attempt to install more packages
# ...but no more than 200 at a time due to pkg_add's internal
# limitations.
chroot ${NANO_WORLDDIR} sh -c \
'ls Pkg/*tbz | xargs -n 200 env PKG_DBDIR='${NANO_PKG_META_BASE}'/pkg pkg_add -v -F' || true
CR0 'ls Pkg/*tbz | xargs -n 200 env PKG_DBDIR='${NANO_PKG_META_BASE}'/pkg pkg_add -v -F'
# See what that got us
now=`ls ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg | wc -l`
@ -795,9 +806,8 @@ cust_pkgng () (
)
#Bootstrap pkg
chroot ${NANO_WORLDDIR} sh -c \
"env ASSUME_ALWAYS_YES=YES SIGNATURE_TYPE=none /usr/sbin/pkg add /Pkg/${_NANO_PKG_PACKAGE}"
chroot ${NANO_WORLDDIR} sh -c "pkg -N >/dev/null 2>&1;"
CR env ASSUME_ALWAYS_YES=YES SIGNATURE_TYPE=none /usr/sbin/pkg add /Pkg/${_NANO_PKG_PACKAGE}
CR pkg -N >/dev/null 2>&1
if [ "$?" -ne "0" ]; then
echo "FAILED: pkg bootstrapping faied"
exit 2
@ -813,19 +823,15 @@ cust_pkgng () (
while true
do
# Record how many we have now
have=`chroot ${NANO_WORLDDIR} sh -c \
'env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info | /usr/bin/wc -l'`
have=$(CR env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info | /usr/bin/wc -l)
# Attempt to install more packages
chroot ${NANO_WORLDDIR} sh -c \
'ls Pkg/*txz | xargs env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg add ' || true
CR0 'ls 'Pkg/*txz' | xargs env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg add'
# See what that got us
now=`chroot ${NANO_WORLDDIR} sh -c \
'env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info | /usr/bin/wc -l'`
now=$(CR env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info | /usr/bin/wc -l)
echo "=== NOW $now"
chroot ${NANO_WORLDDIR} sh -c \
'env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info'
CR env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info
echo "==="
if [ $now -eq $todo ] ; then
echo "DONE $now packages"