From 8fcda9f8aab5450e6772429fe56a3fa4e398d327 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 16 Sep 2018 23:14:53 +0200 Subject: [PATCH] firmware: make firmware-upgrade the version file --- +POST_INSTALL | 4 -- .gitignore | 1 - Makefile | 5 +-- plist | 2 +- src/etc/inc/config.inc | 2 +- .../OPNsense/Base/ControllerBase.php | 44 +++++++++---------- src/opnsense/version/.gitignore | 1 + .../opnsense.in} | 0 src/sbin/opnsense-version | 2 +- 9 files changed, 27 insertions(+), 34 deletions(-) rename src/opnsense/{firmware-product.in => version/opnsense.in} (100%) diff --git a/+POST_INSTALL b/+POST_INSTALL index 1c809a51d..a5aafa85a 100644 --- a/+POST_INSTALL +++ b/+POST_INSTALL @@ -31,10 +31,6 @@ EOF cat /etc/rc.shutdown.bak >> /etc/rc.shutdown rm -f /etc/rc.shutdown.bak -echo "Writing package metadata" -mkdir -p /usr/local/opnsense/version -echo "%%CORE_COMMIT%%" > /usr/local/opnsense/version/opnsense - /usr/local/etc/rc.d/configd start /usr/local/etc/rc.configure_firmware diff --git a/.gitignore b/.gitignore index a9e4e320d..73eed1395 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ /src/etc/ssh/** /src/lib/** /src/opnsense/changelog -/src/opnsense/firmware-product /src/www/wpad.dat diff --git a/Makefile b/Makefile index 11c22ac79..dabe66337 100644 --- a/Makefile +++ b/Makefile @@ -153,9 +153,7 @@ want-${WANT}: mount: @if [ ! -f ${WRKDIR}/.mount_done ]; then \ echo -n "Enabling core.git live mount..."; \ - sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/firmware-product.in > \ - ${.CURDIR}/src/opnsense/firmware-product; \ - echo "${CORE_COMMIT}" > \ + sed ${SED_REPLACE} ${.CURDIR}/src/opnsense/version/opnsense.in > \ ${.CURDIR}/src/opnsense/version/opnsense; \ mount_unionfs ${.CURDIR}/src ${LOCALBASE}; \ touch ${WRKDIR}/.mount_done; \ @@ -168,7 +166,6 @@ umount: echo -n "Disabling core.git live mount..."; \ umount -f ":${.CURDIR}/src"; \ rm ${.CURDIR}/src/opnsense/version/opnsense; \ - rm ${.CURDIR}/src/opnsense/firmware-product; \ rm ${WRKDIR}/.mount_done; \ echo "done"; \ service configd restart; \ diff --git a/plist b/plist index 9f3d20d99..749efd6f3 100644 --- a/plist +++ b/plist @@ -315,7 +315,6 @@ /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist /usr/local/opnsense/contrib/tzdata/iso3166.tab /usr/local/opnsense/contrib/tzdata/zone.tab -/usr/local/opnsense/firmware-product /usr/local/opnsense/mvc/app/cache/README /usr/local/opnsense/mvc/app/config/config.php /usr/local/opnsense/mvc/app/config/loader.php @@ -836,6 +835,7 @@ /usr/local/opnsense/site-python/sqlite3_helper.py /usr/local/opnsense/site-python/watchers/__init__.py /usr/local/opnsense/site-python/watchers/dhcpd.py +/usr/local/opnsense/version/opnsense /usr/local/opnsense/www/api.php /usr/local/opnsense/www/css/bootstrap-datepicker3.min.css /usr/local/opnsense/www/css/flags/1x1/ad.svg diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc index abdaa99d5..ed99c3c69 100644 --- a/src/etc/inc/config.inc +++ b/src/etc/inc/config.inc @@ -30,7 +30,7 @@ */ /* XXX make this a getter function for traceability */ -$g = json_decode(file_get_contents('/usr/local/opnsense/firmware-product'), true); +$g = json_decode(file_get_contents('/usr/local/opnsense/version/opnsense'), true); openlog($g['product_id'], LOG_ODELAY, LOG_USER); register_shutdown_function('closelog'); diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php index 883cfc54f..ddbe146bf 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php @@ -1,29 +1,29 @@ view->ui_theme = $cnf->object()->theme; } - // parse firmware-product product properties, use template (.in) when not found - $firmware_product_fn = __DIR__.'/../../../../../firmware-product'; + // parse product properties, use template (.in) when not found + $firmware_product_fn = __DIR__.'/../../../../../version/opnsense'; $firmware_product_fn = !is_file($firmware_product_fn) ? $firmware_product_fn .".in" : $firmware_product_fn; $product_vars = json_decode(file_get_contents($firmware_product_fn), true); foreach ($product_vars as $product_key => $product_var) { diff --git a/src/opnsense/version/.gitignore b/src/opnsense/version/.gitignore index 72e8ffc0d..96fdad0fa 100644 --- a/src/opnsense/version/.gitignore +++ b/src/opnsense/version/.gitignore @@ -1 +1,2 @@ +!opnsense.in * diff --git a/src/opnsense/firmware-product.in b/src/opnsense/version/opnsense.in similarity index 100% rename from src/opnsense/firmware-product.in rename to src/opnsense/version/opnsense.in diff --git a/src/sbin/opnsense-version b/src/sbin/opnsense-version index feefbc5f8..7d2b8631d 100755 --- a/src/sbin/opnsense-version +++ b/src/sbin/opnsense-version @@ -24,7 +24,7 @@ # POSSIBILITY OF SUCH DAMAGE. PATTERN="s:[^\"]*\"\([^\"]*\)\"[^\"]*\"\([^\"]*\)\".*:\1=\2:" -VERSION="/usr/local/opnsense/firmware-product" +VERSION="/usr/local/opnsense/version/opnsense" if [ ! -f ${VERSION} ]; then echo "Missing ${VERSION}" >&2