From cb0f6bf4f76900e07b7eaa5326cb3d3bfb7919d5 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 23 Jun 2016 09:28:00 -0300 Subject: [PATCH] Move iso_3166-1_list_en.xml to /usr/local/share/pfSense --- src/etc/inc/pfsense-utils.inc | 2 +- src/etc/pfSense.obsoletedfiles | 1 + .../iso_3166-1_list_en.xml | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename src/usr/local/share/{mobile-broadband-provider-info => pfSense}/iso_3166-1_list_en.xml (100%) mode change 100755 => 100644 diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 9880946cda..390c322d22 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -2482,7 +2482,7 @@ function get_country_name($country_code) { return ""; } - $country_names_xml = "/usr/local/share/mobile-broadband-provider-info/iso_3166-1_list_en.xml"; + $country_names_xml = "/usr/local/share/pfSense/iso_3166-1_list_en.xml"; $country_names_contents = file_get_contents($country_names_xml); $country_names = xml2array($country_names_contents); diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles index e7781efba1..74dd499efc 100644 --- a/src/etc/pfSense.obsoletedfiles +++ b/src/etc/pfSense.obsoletedfiles @@ -742,6 +742,7 @@ /usr/local/share/locale/zh_CN.GB2312 /usr/local/share/locale/zh_TW.Big5 /usr/local/share/misc +/usr/local/share/mobile-broadband-provider-info/iso_3166-1_list_en.xml /usr/local/share/nls /usr/local/share/pbi-keys /usr/local/share/pfSense/pfSense-repo-devel.conf diff --git a/src/usr/local/share/mobile-broadband-provider-info/iso_3166-1_list_en.xml b/src/usr/local/share/pfSense/iso_3166-1_list_en.xml old mode 100755 new mode 100644 similarity index 100% rename from src/usr/local/share/mobile-broadband-provider-info/iso_3166-1_list_en.xml rename to src/usr/local/share/pfSense/iso_3166-1_list_en.xml