nfs-utils:make sure /var/lib/nfs exists
BUG=b/162946348
TEST=equery-lakitu w nfs-utils && emerge-lakit nfs-utils
RELEASE_NOTE=Created /var/lib/nfs to install nfs properly
Change-Id: Ibf7105b5fbe73a1c7d689f3f89d176edc7128af6
diff --git a/overlay-lakitu/net-fs/nfs-utils/files/tmpfiles.d b/overlay-lakitu/net-fs/nfs-utils/files/tmpfiles.d
new file mode 100644
index 0000000..663dd86
--- /dev/null
+++ b/overlay-lakitu/net-fs/nfs-utils/files/tmpfiles.d
@@ -0,0 +1,4 @@
+D /var/lib/nfs 0644 - - -
+D /var/lib/nfs/sm 0644 - - -
+D /var/lib/nfs/sm.bak 0644 - - -
+D /var/lib/nfs/v4recovery 0644 - - -
diff --git a/overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1-r1.ebuild b/overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1-r1.ebuild
new file mode 120000
index 0000000..f8df01e
--- /dev/null
+++ b/overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1-r1.ebuild
@@ -0,0 +1 @@
+overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild b/overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
index da307e1..518b0d9 100644
--- a/overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
+++ b/overlay-lakitu/net-fs/nfs-utils/nfs-utils-2.5.1.ebuild
@@ -128,8 +128,15 @@
# Don't overwrite existing xtab/etab, install the original
# versions somewhere safe... more info in pkg_postinst
+ # these empty directories are not carried into image/var
keepdir /var/lib/nfs/{,sm,sm.bak}
- mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+ # tmpfiles stuff to make sure var/lib/nfs and its
+ # subdirs are installed
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "nfs.conf"
+
+ mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
# Install some client-side binaries in /sbin
dodir /sbin
@@ -170,10 +177,10 @@
sed -i \
-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
"${ED}${systemd_systemunitdir}"/* || die
-
- keepdir /var/lib/nfs #368505
- keepdir /var/lib/nfs/v4recovery #603628
-
+
+ # keepdir /var/lib/nfs #368505
+ # keepdir /var/lib/nfs/v4recovery #603628
+
}
pkg_postinst() {
@@ -181,9 +188,9 @@
# src_install we put them in /usr/lib/nfs for safe-keeping, but
# the daemons actually use the files in /var/lib/nfs. #30486
local f
- for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+ for f in "${EROOT}"/usr/$(get_libdir)/lib/nfs/*; do
+ [[ -e ${EROOT}/var/lib/nfs/${f} ]] && continue
+ einfo "Copying default ${f} from ${EPREFIX}/usr/$(get_libdir)/lib/nfs to "${EPREFIX}"/var/lib/nfs"
cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
done
