diff options
| -rw-r--r-- | src/etc/inc/globals.inc | 3 | ||||
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index b00b65d..93f55ce 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -89,7 +89,8 @@ $g = array( "default_timezone" => "Etc/UTC", "language" => "en_US", "default_config_backup_count" => 30, - "minimumtableentries_bogonsv6" => 400000 + "minimumtableentries_bogonsv6" => 400000, + "alternativemetaports" => array("vmware") ); /* IP TOS flags */ diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index 06c9c3d..4748ac8 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -1224,8 +1224,11 @@ function get_meta_pkg_name() { /* XXX: Use pkg annotation */ if (is_pkg_installed($g['product_name'])) { return $g['product_name']; - } else if (is_pkg_installed($g['product_name'] . '-vmware')) { - return $g['product_name'] . '-vmware'; + } + foreach ($g['alternativemetaports'] as $suffix) { + if (is_pkg_installed($g['product_name'] . '-' . $suffix)) { + return $g['product_name'] . '-' . $suffix; + } } return false; } |
