From 5fac13aafdc335864082fd2e3f5a843d33859fe4 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Wed, 6 Jul 2016 07:47:17 -0300
Subject: [PATCH] Make sure resolv.conf is present during nanobsd upgrade.
 Fixes #6557

---
 src/usr/local/sbin/pfSense-upgrade | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade
index 10f2dfface..44b0f95f26 100755
--- a/src/usr/local/sbin/pfSense-upgrade
+++ b/src/usr/local/sbin/pfSense-upgrade
@@ -549,6 +549,9 @@ setup_nanobsd_env() {
 	_exec "/sbin/fsck -y -t ufs /dev/${_update_partition}" "Testing duplicated partition integrity" mute
 	_exec "mount /dev/${_update_partition} ${chroot_dir}" "Mounting second partition to run upgrade" mute
 
+	# Make sure resolv.conf is present, otherwise upgrade may fail (bug #6557)
+	_exec "cp -f /etc/resolv.conf ${chroot_dir}/etc" "Copying resolv.conf to upgrade partition" mute
+
 	sed -i '' -e "s,^${_cur_partition},/dev/${_update_partition}," \
 		${chroot_dir}/etc/fstab