diff options
author | Renato Botelho <renato@netgate.com> | 2016-07-06 07:47:17 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-07-06 07:47:34 -0300 |
commit | c55c20159db6e28af58911a358e29f605c0343a1 (patch) | |
tree | 64ee356ff1d5b64e2a451c88b9d58d3dc7eb23b5 /src | |
parent | 4c5cb2f6c23cca4076dd70c277db6014fe9e5b7b (diff) | |
download | pfsense-c55c20159db6e28af58911a358e29f605c0343a1.zip pfsense-c55c20159db6e28af58911a358e29f605c0343a1.tar.gz |
Make sure resolv.conf is present during nanobsd upgrade. Fixes #6557
Diffstat (limited to 'src')
-rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 3 |
1 files changed, 3 insertions, 0 deletions
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 |