dualboot: get rid of configuration file for dualboot

Now the cloud connector has all the logic to detect if its
running in a dual_boot system, so it is not needed this anymore.

We need to modify on the fly the path to save the image in a
dualboot system.

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
This commit is contained in:
Francisco Gil 2022-10-21 17:28:16 +02:00
parent 378135b9c6
commit 8c1b0f8f9e
2 changed files with 4 additions and 49 deletions

View File

@ -1,48 +0,0 @@
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 8 Jul 2021 09:43:50 +0200
Subject: [PATCH] cc.conf: pre-set for dual boot mode
- Change default firmware download path to external media
'/home/root/'.
- Remove '/mnt/update' virtual directory.
- Enable dual boot mode.
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
app/cfg_files/cc.conf | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/app/cfg_files/cc.conf b/app/cfg_files/cc.conf
index 7018efb..bff9332 100644
--- a/app/cfg_files/cc.conf
+++ b/app/cfg_files/cc.conf
@@ -99,27 +99,22 @@ virtual-dirs
vdir {
name = "tmp"
path = "/tmp"
}
- vdir {
- name = "update"
- path = "/mnt/update"
- }
-
vdir {
name = "media"
path = "/run/media"
}
}
# Firmware Download Path: Absolute path to download the firmware packages from
# the cloud. It must be an existing directory.
-firmware_download_path = /mnt/update
+firmware_download_path = /home/root
# Enable dualboot support
-dualboot = false
+dualboot = true
# Enables on the fly firmware update support
on_the_fly = false
#===============================================================================

View File

@ -19,7 +19,6 @@ SRC_URI = " \
${CC_GIT_URI};branch=${SRCBRANCH} \
file://cloud-connector-init \
file://cloud-connector.service \
${@oe.utils.vartrue('DUALBOOT_ENABLED', 'file://0001-cc.conf-pre-set-for-dual-boot-mode.patch', '', d)} \
"
S = "${WORKDIR}/git"
@ -35,6 +34,10 @@ do_install() {
install -m 0644 ${WORKDIR}/cloud-connector.service ${D}${systemd_unitdir}/system/
fi
if ${@oe.utils.vartrue('DUALBOOT_ENABLED', 'true', 'false', d)}; then
sed -i "/firmware_download_path = \/mnt\/update/c\firmware_download_path = \/home\/root" ${D}${sysconfdir}/cc.conf
fi
install -d ${D}${sysconfdir}/init.d/
install -m 755 ${WORKDIR}/cloud-connector-init ${D}${sysconfdir}/cloud-connector
ln -sf /etc/cloud-connector ${D}${sysconfdir}/init.d/cloud-connector