From 6c97a9eb608eefb423e5811d716b8706fe2859aa Mon Sep 17 00:00:00 2001 From: Antoine Prieels Date: Fri, 3 Jul 2020 11:48:15 +0000 Subject: [PATCH] [FIX] hw_drivers, pos: Move IoTBox version file We move the IoT Box version file from /home/pi to /var/odoo so its not overriden after an auto-flash of the IoT Box. closes odoo/odoo#54063 X-original-commit: ce0700ce401523267b5a8bd5665a368cfea24912 Signed-off-by: Quentin Lejeune (qle) --- addons/hw_drivers/tools/helpers.py | 2 +- addons/point_of_sale/tools/posbox/posbox_create_image.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/hw_drivers/tools/helpers.py b/addons/hw_drivers/tools/helpers.py index 64bff4be7ab..ad825e4e1cc 100644 --- a/addons/hw_drivers/tools/helpers.py +++ b/addons/hw_drivers/tools/helpers.py @@ -162,7 +162,7 @@ def get_token(): return read_file_first_line('token') def get_version(): - return subprocess.check_output(['cat', '/home/pi/iotbox_version']).decode().rstrip() + return subprocess.check_output(['cat', '/var/odoo/iotbox_version']).decode().rstrip() def get_wifi_essid(): wifi_options = [] diff --git a/addons/point_of_sale/tools/posbox/posbox_create_image.sh b/addons/point_of_sale/tools/posbox/posbox_create_image.sh index 853cb06e7b4..84a2932d33f 100755 --- a/addons/point_of_sale/tools/posbox/posbox_create_image.sh +++ b/addons/point_of_sale/tools/posbox/posbox_create_image.sh @@ -131,7 +131,8 @@ cp -av "${OVERWRITE_FILES_BEFORE_INIT_DIR}"/* "${MOUNT_POINT}" chroot "${MOUNT_POINT}" /bin/bash -c "sudo /etc/init_posbox_image.sh" # copy iotbox version -echo "${VERSION_IOTBOX}" > "${MOUNT_POINT}"/home/pi/iotbox_version +mkdir -pv "${MOUNT_POINT}"/var/odoo +echo "${VERSION_IOTBOX}" > "${MOUNT_POINT}"/var/odoo/iotbox_version # get rid of the git clone rm -rfv "${CLONE_DIR}"