diff options
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 2 | ||||
| -rw-r--r-- | src/etc/version | 2 | ||||
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 3 | ||||
| -rw-r--r-- | src/usr/local/www/pkg_edit.php | 13 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 6f3f18e..35526d1 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -410,7 +410,7 @@ function get_pkg_info($pkgs = 'all', $info = 'all', $only_local = false) { if ($lock) { mark_subsystem_dirty('pkg'); } - $rc = pkg_exec("search {$extra_param}--raw-format json-compact " . $pkgs, $out, $err); + $rc = pkg_exec("search {$extra_param}-R --raw-format json-compact " . $pkgs, $out, $err); if ($lock) { clear_subsystem_dirty('pkg'); } diff --git a/src/etc/version b/src/etc/version index 008d7ae..f011c81 100644 --- a/src/etc/version +++ b/src/etc/version @@ -1 +1 @@ -2.4-DEVELOPMENT +2.4.0-DEVELOPMENT 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 diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 20df922..f7280c3 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -1420,15 +1420,16 @@ foreach ($pkg['fields']['field'] as $pkga) { unset($value); $width = null; - if ($rowhelper['value'] != "") { - $value = $rowhelper['value']; - } $fieldname = $rowhelper['fieldname']; $fielddescr = $rowhelper['fielddescr']; - // if user is editing a record, load in the data. - if (isset($id) && $a_pkg[$id]) { + // If input validation failed, read the value from the POST data so that hte user's input is not lost + if ($get_from_post && isset($_POST[$fieldname.$rowcounter])) { + $value = $_POST[$fieldname.$rowcounter]; + } elseif (isset($id) && $a_pkg[$id]) { $value = $row[$fieldname]; + } elseif ($rowhelper['value'] != "") { + $value = $rowhelper['value']; } $type = $rowhelper['type']; @@ -1437,7 +1438,7 @@ foreach ($pkg['fields']['field'] as $pkga) { $value = base64_decode($value); } } - $fieldname = $rowhelper['fieldname']; + if ($rowhelper['size']) { $size = $rowhelper['size']; |
