Changeset View
Changeset View
Standalone View
Standalone View
release/tools/vmimage.subr
| Show First 20 Lines • Show All 157 Lines • ▼ Show 20 Lines | if [ -z "${VMCONFIG}" -o -c "${VMCONFIG}" ]; then | ||||
| # Expand the filesystem to fill the disk. | # Expand the filesystem to fill the disk. | ||||
| echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf | echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf | ||||
| fi | fi | ||||
| return 0 | return 0 | ||||
| } | } | ||||
| vm_extra_install_packages() { | vm_extra_install_packages() { | ||||
| if [ -n "${WITHOUT_QEMU}" ]; then | if [ -z "${VM_EXTRA_PACKAGES}" ]; then | ||||
cperciva: Should we keep this for the non-NO_ROOT case? | |||||
| return 0 | return 0 | ||||
| fi | fi | ||||
| if [ -n "${NO_ROOT}" ]; then | |||||
| if [ -z "${VM_EXTRA_PACKAGES}" ]; then | for pkg in ${VM_EXTRA_PACKAGES}; do | ||||
| INSTALL_AS_USER=yes \ | |||||
| ${PKG_CMD} \ | |||||
| -o METALOG=${DESTDIR}/METALOG.pkg \ | |||||
Done Inline ActionsDo we need to add -o ABI also, like 340e68fd7c0d62cac1f0876b6475a89df5065db5 emaste: Do we need to add `-o ABI` also, like 340e68fd7c0d62cac1f0876b6475a89df5065db5
Or, does ABI get… | |||||
Done Inline ActionsI believe it's not required, pkg will infer it from /usr/bin/uname relative to the rootdir. markj: I believe it's not required, pkg will infer it from /usr/bin/uname relative to the rootdir. | |||||
| -o REPOS_DIR=${PKG_REPOS_DIR} \ | |||||
| -o PKG_DBDIR=${DESTDIR}/var/db/pkg \ | |||||
| -r ${DESTDIR} \ | |||||
| install -y -r ${PKG_REPO_NAME} $pkg | |||||
| done | |||||
| metalog_add_data ./var/db/pkg/local.sqlite | |||||
| else | |||||
| if [ -n "${WITHOUT_QEMU}" ]; then | |||||
| return 0 | return 0 | ||||
| fi | fi | ||||
| chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ | chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ | ||||
| /usr/sbin/pkg bootstrap -y | /usr/sbin/pkg bootstrap -y | ||||
| for p in ${VM_EXTRA_PACKAGES}; do | for p in ${VM_EXTRA_PACKAGES}; do | ||||
| chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ | chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ | ||||
| /usr/sbin/pkg install -y ${p} | /usr/sbin/pkg install -y ${p} | ||||
| done | done | ||||
| fi | |||||
| return 0 | return 0 | ||||
| } | } | ||||
| vm_extra_install_ports() { | vm_extra_install_ports() { | ||||
| # Prototype. When overridden, installs additional ports within the | # Prototype. When overridden, installs additional ports within the | ||||
| # virtual machine environment. | # virtual machine environment. | ||||
| Show All 26 Lines | chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ | ||||
| /usr/local/sbin/pkg clean -y -a | /usr/local/sbin/pkg clean -y -a | ||||
| fi | fi | ||||
| return 0 | return 0 | ||||
| } | } | ||||
| buildfs() { | buildfs() { | ||||
| local md tmppool | local md tmppool | ||||
| if [ -f ${DESTDIR}/METALOG.pkg ]; then | |||||
| cat ${DESTDIR}/METALOG.pkg >> ${DESTDIR}/METALOG | |||||
| fi | |||||
| case "${VMFS}" in | case "${VMFS}" in | ||||
| ufs) | ufs) | ||||
| cd ${DESTDIR} && ${MAKEFS} ${MAKEFSARGS} -o label=rootfs -o version=2 -o softupdates=1 \ | cd ${DESTDIR} && ${MAKEFS} ${MAKEFSARGS} -o label=rootfs -o version=2 -o softupdates=1 \ | ||||
| ${VMBASE} .${NO_ROOT:+/METALOG} | ${VMBASE} .${NO_ROOT:+/METALOG} | ||||
| ;; | ;; | ||||
| zfs) | zfs) | ||||
| cd ${DESTDIR} && ${MAKEFS} -t zfs ${MAKEFSARGS} \ | cd ${DESTDIR} && ${MAKEFS} -t zfs ${MAKEFSARGS} \ | ||||
| ▲ Show 20 Lines • Show All 153 Lines • Show Last 20 Lines | |||||
Should we keep this for the non-NO_ROOT case?