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:54 -0300 |
| commit | e63e23acd30d2d18fe3e17f859c23a2aa69c4290 (patch) | |
| tree | 9f37984a2a6e9c9da34c31e355982341518dd5b1 | |
| parent | 0a3ac6e8ed2d18061f343b1ea0a82e82f048fdcc (diff) | |
| download | pfsense-e63e23acd30d2d18fe3e17f859c23a2aa69c4290.zip pfsense-e63e23acd30d2d18fe3e17f859c23a2aa69c4290.tar.gz | |
Make sure resolv.conf is present during nanobsd upgrade. Fixes #6557
| -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 |
