Merge pull request #74 from quaresmajose/nfs-utils

Backport [kirkstone]: nfs-utils: update the systemd tmpfiles and fix the warning
uptane · May 5, 2023 · be12177 · be12177
2 parents 1cf05e3 + cf85a71
commit be12177
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git 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
@@ -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"