diff options
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/gce.conf | 2 | ||||
| -rw-r--r-- | release/tools/vmimage.subr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/tools/gce.conf b/release/tools/gce.conf index a7ccfc27a75c..b0a65c2981e1 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -21,7 +21,7 @@ vm_extra_install_base() { echo 'search google.internal' > ${DESTDIR}/etc/resolv.conf echo 'nameserver 169.254.169.254' >> ${DESTDIR}/etc/resolv.conf echo 'nameserver 8.8.8.8' >> ${DESTDIR}/etc/resolv.conf - metalog_add ./etc/resolv.conf + metalog_add_data ./etc/resolv.conf } vm_extra_pre_umount() { diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 99e1936296e1..3bfef585f613 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -97,7 +97,7 @@ vm_install_base() { if [ -z "${NOPKGBASE}" ]; then local pkg_cmd - pkg_cmd="pkg --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR} + pkg_cmd="${PKG_CMD} --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR} -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes -o ABI=${PKG_ABI} -o INSTALL_AS_USER=yes " if [ -n "${NO_ROOT}" ]; then |