svn commit: r357750 - head/release/tools

Colin Percival cperciva at FreeBSD.org
Tue Feb 11 04:05:46 UTC 2020


Author: cperciva
Date: Tue Feb 11 04:05:45 2020
New Revision: 357750
URL: https://svnweb.freebsd.org/changeset/base/357750

Log:
  Mount /dev while deinstalling pkg inside EC2 AMIs.
  
  This gets rid of (harmless) warnings:
  "pkg: Cannot open /dev/null:No such file or directory".
  
  MFC after:	2 weeks

Modified:
  head/release/tools/ec2.conf

Modified: head/release/tools/ec2.conf
==============================================================================
--- head/release/tools/ec2.conf	Tue Feb 11 04:03:22 2020	(r357749)
+++ head/release/tools/ec2.conf	Tue Feb 11 04:05:45 2020	(r357750)
@@ -40,8 +40,10 @@ vm_extra_pre_umount() {
 	# catalogue and install or update pkg when the instance first
 	# launches, so these files would just be replaced anyway; removing
 	# them from the image allows it to boot faster.
+	mount -t devfs devfs ${DESTDIR}/dev
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg delete -f -y pkg
+	umount ${DESTDIR}/dev
 	rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
 
 	# The size of the EC2 root disk can be configured at instance launch


More information about the svn-src-head mailing list