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

Revert r274773, after I *specifically* objected to this change

Browse Source 
numerous times.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
gjb 2014-11-21 02:30:37 +00:00
parent 8b1726e8cc
commit 5074f8a73e
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/tools/azure.conf
View File

@ -5,7 +5,7 @@
# Set to a list of packages to install.
# Example:
#export VM_EXTRA_PACKAGES="www/apache24 ports-mgmt/pkg"
#export VM_EXTRA_PACKAGES="www/apache24"
export VM_EXTRA_PACKAGES=
# Set to a list of third-party software to enable in rc.conf(5).
@ -17,6 +17,7 @@ vm_extra_install_base() {
fetch -o ${DESTDIR}/usr/sbin/waagent \
http://people.freebsd.org/~gjb/waagent
chmod +x ${DESTDIR}/usr/sbin/waagent
rm -f ${DESTDIR}/etc/resolv.conf
return 0
}
@ -32,6 +33,8 @@ vm_extra_pre_umount() {
echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
rm -f ${DESTDIR}/etc/resolv.conf
return 0
}

5
release/tools/openstack.conf
View File

@ -4,7 +4,7 @@
#
# Set to a list of packages to install.
export VM_EXTRA_PACKAGES="net/cloud-init ports-mgmt/pkg"
export VM_EXTRA_PACKAGES="net/cloud-init"
# Set to a list of third-party software to enable in rc.conf(5).
export VM_RC_LIST="cloudinit"
@ -13,6 +13,7 @@ vm_extra_install_base() {
fetch -o ${DESTDIR}/usr/sbin/waagent \
http://people.freebsd.org/~gjb/waagent
chmod +x ${DESTDIR}/usr/sbin/waagent
rm -f ${DESTDIR}/etc/resolv.conf
return 0
}
@ -21,5 +22,7 @@ vm_extra_pre_umount() {
echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
rm -f ${DESTDIR}/etc/resolv.conf
return 0
}

21
release/tools/vmimage.subr
View File

@ -90,6 +90,8 @@ vm_install_base() {
chroot ${DESTDIR} /etc/rc.d/ldconfig forcestart
umount ${DESTDIR}/dev
cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf
return 0
}
@ -112,18 +114,15 @@ vm_extra_enable_services() {
}
vm_extra_install_packages() {
mkdir -p ${DESTDIR}/dev
mount -t devfs devfs ${DESTDIR}/dev
chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \
/usr/sbin/pkg bootstrap -y
if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then
PKGSDIR=`mktemp -d`
ABI=`/usr/sbin/pkg -c ${DESTDIR} config abi`
/usr/sbin/pkg -o ABI=${ABI} fetch -o ${PKGSDIR} -d -y ${VM_EXTRA_PACKAGES}
for PKG in ${PKGSDIR}/All/*; do
/usr/sbin/pkg -c ${DESTDIR} add -M - < ${PKG}
done
rm -r ${PKGSDIR}
if [ -z "${NOREPOSQLITE}" ]; then
cp /var/db/pkg/repo-FreeBSD.sqlite ${DESTDIR}/var/db/pkg
fi
chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \
/usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES}
fi
umount ${DESTDIR}/dev
return 0
}
@ -139,6 +138,8 @@ vm_extra_pre_umount() {
# Prototype. When overridden, installs additional ports within the
# virtual machine environment.
rm -f ${DESTDIR}/etc/resolv.conf
return 0
}