From cf85a718e1532f5b0f40da8afc085c40af7be19a Mon Sep 17 00:00:00 2001
From: Jose Quaresma <jose.quaresma@foundries.io>
Date: Thu, 4 May 2023 11:34:51 +0000
Subject: [PATCH] nfs-utils: update the systemd tmpfiles and fix the warning

| WARNING: lmp-base-console-image-1.0-r0 do_image_ostree: Data in 'var/lib' directory is not preserved by OSTree. Consider moving it under '/usr'
| var/lib/nfs
| var/lib/nfs/etab
| var/lib/nfs/statd
| var/lib/nfs/statd/sm
| var/lib/nfs/statd/state
| var/lib/nfs/statd/sm.bak
| var/lib/nfs/rmtab
| var/lib/nfs/v4recovery

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
(cherry picked from commit 012e7eda5423595c77277ff70fdfdecb846c27a5)
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 .../nfs-utils/nfs-utils/tmpfiles.conf                |  5 ++++-
 recipes-connectivity/nfs-utils/nfs-utils_%.bbappend  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/recipes-connectivity/nfs-utils/nfs-utils/tmpfiles.conf b/recipes-connectivity/nfs-utils/nfs-utils/tmpfiles.conf
index 84ab0dc2..87c982d6 100644
--- a/recipes-connectivity/nfs-utils/nfs-utils/tmpfiles.conf
+++ b/recipes-connectivity/nfs-utils/nfs-utils/tmpfiles.conf
@@ -1,5 +1,8 @@
 d /var/lib/nfs 0755 root root -
-d /var/lib/nfs/v4recovery 0755 root root -
+f /var/lib/nfs/etab 0644 rpcuser rpcuser -
 d /var/lib/nfs/statd 0755 rpcuser rpcuser -
 d /var/lib/nfs/statd/sm 0700 rpcuser rpcuser -
+f /var/lib/nfs/statd/state 0644 rpcuser rpcuser -
 d /var/lib/nfs/statd/sm.bak 0700 rpcuser rpcuser -
+f /var/lib/nfs/rmtab 0644 rpcuser rpcuser -
+d /var/lib/nfs/v4recovery 0755 root root -
diff --git a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
index 60bb9513..3920b7bb 100644
--- a/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
+++ b/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend
@@ -4,6 +4,18 @@ SRC_URI:append:sota = " file://tmpfiles.conf"
 
 do_install:append:sota () {
     install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${nonarch_libdir}/tmpfiles.d/nfs-utils.conf
+
+    rm -v \
+        ${D}/var/lib/nfs/etab \
+        ${D}/var/lib/nfs/statd/state \
+        ${D}/var/lib/nfs/rmtab
+
+    rmdir -v \
+        ${D}/var/lib/nfs/statd/sm.bak \
+        ${D}/var/lib/nfs/statd/sm \
+        ${D}/var/lib/nfs/statd \
+        ${D}/var/lib/nfs/v4recovery \
+        ${D}/var/lib/nfs
 }
 
 FILES:${PN} += "${nonarch_libdir}/tmpfiles.d/nfs-utils.conf"