diff --git a/src/opnsense/scripts/pkg_updatecheck.sh b/src/opnsense/scripts/pkg_updatecheck.sh index f7fb63566..cb1966ce3 100755 --- a/src/opnsense/scripts/pkg_updatecheck.sh +++ b/src/opnsense/scripts/pkg_updatecheck.sh @@ -37,6 +37,7 @@ # download_size: none| # extra_space_required: none| # new_packages: array with { name: , version: } +# reinstall_packages: array with { name: , version: } # upgrade_packages: array with { name: , current_version: , new_version: } # TODO: Add object with items that will be removed or uninstalled @@ -149,6 +150,34 @@ if [ "$pkg_running" == "" ]; then fi done + # Check if there are packages that need to be reinstalled + for i in $(cat $tmp_pkg_output_file | cut -d '(' -f1); do + #echo $i + if [ "$itemcount" -gt "$linecount" ]; then + #echo $i + if [ `echo $linecount + 1 | bc` -eq "$itemcount" ]; then + if [ "`echo $i | grep '-'`" == "" ]; then + itemcount=0 # This is not a valid item so reset item count + else + name=`echo $i | cut -d '-' -f1` + version=`echo $i | cut -d '-' -f2` + itemcount=`echo $itemcount + 1 | bc` # Get ready for next item + if [ "$packages_reinstall" == "" ]; then + packages_reinstall=$packages_reinstall"{\"name\":\"$name\"," # If it is the first item then we do not want a seperator + packages_reinstall=$packages_reinstall"\"version\":\"$version\"}" + else + packages_reinstall=$packages_reinstall", {\"name\":\"$name\"," + packages_reinstall=$packages_reinstall"\"version\":\"$version\"}" + fi + fi + fi + fi + linecount=`echo $linecount + 1 | bc` + if [ "$i" == "REINSTALLED:" ]; then + itemcount=`echo $linecount + 1 | bc` + fi + done + # Now check if there are upgrades to install for i in $(cat $tmp_pkg_output_file); do if [ "$itemcount" -gt "$linecount" ]; then @@ -201,7 +230,7 @@ if [ "$pkg_running" == "" ]; then # Get date/timestamp last_check=`date` # Write our json structure to disk - echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"core_version\":\"$core_version\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"upgrade_packages\":[$packages_upgraded]}" > $package_json_output + echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"core_version\":\"$core_version\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"reinstall_packages\":[$packages_reinstall],\"upgrade_packages\":[$packages_upgraded]}" > $package_json_output else # pkg is already running, quitting fi diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php index b990c37c5..00e1ec040 100644 --- a/src/www/system_authservers.php +++ b/src/www/system_authservers.php @@ -457,7 +457,6 @@ function select_clicked() {
-
@@ -806,7 +805,7 @@ function select_clicked() { -
+
@@ -856,7 +855,7 @@ function select_clicked() { ?>
-
+ diff --git a/src/www/system_firmware_check.php b/src/www/system_firmware_check.php index 6820b7449..6f0c06539 100644 --- a/src/www/system_firmware_check.php +++ b/src/www/system_firmware_check.php @@ -148,7 +148,7 @@ include("head.inc");
'; + echo ''; echo ''; echo ''; echo ''; @@ -168,33 +168,35 @@ include("head.inc"); echo ''; } - echo '
Package NameCurrent Version
'; - ?> -
- - - - Required new Installs - - - -
- '; - echo ''; - echo 'Package Name'; - echo ''; - echo ''; foreach ($pkg_status["new_packages"] as $upgrade_new) { - echo ''; - echo ''.$upgrade_new["name"].'
'; - echo ''; + echo ''; + echo ''; + echo ''.$upgrade_new["name"].'
'; + echo ''; + echo ''; + echo 'NEW
'; + echo ''; + echo ''; + echo ''.$upgrade_new["version"].'
'; + echo ''; + echo ''; + } + foreach ($pkg_status["reinstall_packages"] as $upgrade_new) { + echo ''; + echo ''; + echo ''.$upgrade_new["name"].'
'; + echo ''; + echo ''; + echo ''.$upgrade_new["version"].'
'; + echo ''; + echo ''; + echo 'REINSTALL
'; + echo ''; echo ''; } echo ''; ?>
- diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php index 443e81e16..91fcc92b1 100644 --- a/src/www/system_gateway_groups_edit.php +++ b/src/www/system_gateway_groups_edit.php @@ -223,7 +223,6 @@ jQuery(function ($) {
-
@@ -265,7 +264,7 @@ jQuery(function ($) { echo "
"; echo "{$gateway['name']} "; echo ""; - echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -286,7 +285,7 @@ jQuery(function ($) { } } echo ""; - echo "\n"; echo "\n"; foreach($carplist as $vip => $address) { echo "\n"; @@ -318,7 +317,7 @@ jQuery(function ($) {
- $categoryd) { echo "
-
diff --git a/src/www/system_gateways_edit.php b/src/www/system_gateways_edit.php index 6e25415fd..a4b1be5b6 100644 --- a/src/www/system_gateways_edit.php +++ b/src/www/system_gateways_edit.php @@ -643,7 +643,6 @@ function enable_change() { echo "\n"; ?> -
@@ -656,7 +655,7 @@ function enable_change() {
- $ifacename) { @@ -673,7 +672,7 @@ function enable_change() {
- "IPv4", "inet6" => "IPv6"); foreach ($options as $name => $string) { @@ -868,7 +867,6 @@ function enable_change() {
-
diff --git a/src/www/system_groupmanager.php b/src/www/system_groupmanager.php index 1ff1f6c9c..8901fb3b5 100644 --- a/src/www/system_groupmanager.php +++ b/src/www/system_groupmanager.php @@ -261,7 +261,6 @@ function presubmit() { -
-
" /> -
@@ -527,7 +524,6 @@ function presubmit() { ?>
-
-
'; return confirm('');" title="" data-toggle="tooltip" data-placement="left"> + @@ -855,7 +855,6 @@ function sshkeyClicked(obj) {
-
-
- - + - + - -
+

-
+ @@ -931,7 +931,6 @@ function sshkeyClicked(obj) {

    @@ -963,7 +962,20 @@ function sshkeyClicked(obj) { ?>
-
+ + + + + + + + + + + + +
System AdmininistratorDisabled UserNormal User
+
-
@@ -132,7 +131,7 @@ include("head.inc");
-
-