diff options
| -rw-r--r-- | src/usr/local/share/pfSense/pre_upgrade_command | 6 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/usr/local/share/pfSense/pre_upgrade_command b/src/usr/local/share/pfSense/pre_upgrade_command index d51637e..8c141a4 100644 --- a/src/usr/local/share/pfSense/pre_upgrade_command +++ b/src/usr/local/share/pfSense/pre_upgrade_command @@ -17,9 +17,6 @@ if which pbi_info >/dev/null 2>&1; then for pbi in $(pbi_info); do echo ">>> Removing PBI ${pbi} and all symlinks" pbi_prefix=$(pbi_info ${pbi} | awk '$1 == "Prefix:" { print $2 }') - if [ ! -d "${pbi_prefix}" ]; then - continue - fi for subdir in bin sbin; do if [ ! -d "${pbi_prefix}/${subdir}" ]; then @@ -41,6 +38,9 @@ if which pbi_info >/dev/null 2>&1; then pbi_delete ${pbi} done + + # Cleanup remaining symbolic links + find / -type l -lname '/usr/pbi/*' -delete fi # Hack to workaround ticket #3749 diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 8a7a046..c0d2042 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -966,7 +966,7 @@ function build_flag_table() { $flagtable .= "</table>"; $flagtable .= '<input type="checkbox" name="tcpflags_any" id="tcpflags_any" value="on"'; - $flagtable .= $pconfig['tcpflags_any'] ? 'checked':'' . '/>'; + $flagtable .= ($pconfig['tcpflags_any'] ? 'checked':'') . '/>'; $flagtable .= '<strong>' . gettext(" Any flags.") . '</strong>'; return($flagtable); @@ -1505,7 +1505,7 @@ $section->addInput(new Form_Checkbox( $section->addInput(new Form_Select( 'statetype', 'State type', - (isset($pconfig['statetype'])) ? "keep state":$pconfig['statetype'], + (isset($pconfig['statetype'])) ? $pconfig['statetype'] : "keep state", array( 'keep state' => gettext('Keep'), 'sloppy state' => gettext('Sloppy'), |
