From c55c20159db6e28af58911a358e29f605c0343a1 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Wed, 6 Jul 2016 07:47:17 -0300 Subject: Make sure resolv.conf is present during nanobsd upgrade. Fixes #6557 --- src/usr/local/sbin/pfSense-upgrade | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/usr/local/sbin') diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 10f2dff..44b0f95 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 -- cgit v1.1