summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/recipes-core/nv-sync
diff options
context:
space:
mode:
authorjmbills <jason.m.bills@intel.com>2021-10-04 22:42:48 +0300
committerGitHub <noreply@github.com>2021-10-04 22:42:48 +0300
commit0c9e31989c615598b5d042ffab385606660c93c0 (patch)
tree8019999b0ca042482e5193d6cabc06220c71d776 /meta-openbmc-mods/meta-common/recipes-core/nv-sync
parent04cd92067d2481643df5010cb39b2134b648cf4d (diff)
parentffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff)
downloadopenbmc-0c9e31989c615598b5d042ffab385606660c93c0.tar.xz
Merge pull request #72 from Intel-BMC/update2021-0.751-0.75
Update
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-core/nv-sync')
-rw-r--r--meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd8
-rw-r--r--meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb6
2 files changed, 10 insertions, 4 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd
index e2bb4bb0c..538c96875 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync/nv-syncd
@@ -3,8 +3,12 @@
NVMP=/tmp/.rwfs
SOMP=/var/sofs
+clean_var_volatile_tmp() {
+ rm -rf $NVMP/.overlay/var/volatile/tmp/* || :
+}
+
do_sync() {
- rsync -a --delete /tmp/.overlay/ $NVMP/.overlay
+ rsync -a --delete --exclude='**/var/volatile/tmp/**' /tmp/.overlay/ $NVMP/.overlay
sync $NVMP/.overlay
}
@@ -25,6 +29,8 @@ trap stop_nv EXIT
mount -o remount,rw $NVMP
mount -o remount,rw $SOMP
+clean_var_volatile_tmp
+
# Run rsync periodically to sync the overlay to NV storage
while true; do
do_sync
diff --git a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb
index fa74149d4..a30df4dc6 100644
--- a/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-core/nv-sync/nv-sync_git.bb
@@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fe
inherit systemd
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
-FILES_${PN} += "${systemd_system_unitdir}/nv-sync.service \
+FILES:${PN} += "${systemd_system_unitdir}/nv-sync.service \
${libdir}/tmpfiles.d/nv-sync-tmp.conf"
do_install() {
@@ -26,4 +26,4 @@ do_install() {
install -m 0644 ${WORKDIR}/nv-sync-tmp.conf ${D}${libdir}/tmpfiles.d/
}
-SYSTEMD_SERVICE_${PN} += " nv-sync.service"
+SYSTEMD_SERVICE:${PN} += " nv-sync.service"