From db530ac431fbe5d576de9d02d2962e754c3c42e2 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Tue, 17 Jan 2017 12:51:19 -0800 Subject: [PATCH] net-fs/nfs-utils: Fix arm64 systemd-tmpfiles-setup Update nfs-utils.conf to use /usr/lib64. Commit "585e9070f2c1 (net-fs/nfs-utils: copy default files into /var) made a change to nfs-utils.conf that copies files using the symbolic link '/usr/lib'. This link is not available on arm64, so broke the systemd-tmpfiles-setup service on arm64 systems. Fixes https://github.com/coreos/bugs/issues/1763 (Failed Units: 1 systemd-tmpfiles-setup.service) Signed-off-by: Geoff Levand --- .../coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf | 8 ++++---- ...s-utils-1.3.2-r9.ebuild => nfs-utils-1.3.2-r10.ebuild} | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/{nfs-utils-1.3.2-r9.ebuild => nfs-utils-1.3.2-r10.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf index 225a8b8ba9..8a0f12dbd0 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf @@ -1,7 +1,7 @@ d /var/lib/nfs/rpc_pipefs d /var/lib/nfs/v4recovery d /var/lib/nfs/v4root -C /var/lib/nfs/etab - - - - /usr/lib/nfs/etab -C /var/lib/nfs/rmtab - - - - /usr/lib/nfs/rmtab -C /var/lib/nfs/state - - - - /usr/lib/nfs/state -C /var/lib/nfs/xtab - - - - /usr/lib/nfs/xtab +C /var/lib/nfs/etab - - - - /usr/lib64/nfs/etab +C /var/lib/nfs/rmtab - - - - /usr/lib64/nfs/rmtab +C /var/lib/nfs/state - - - - /usr/lib64/nfs/state +C /var/lib/nfs/xtab - - - - /usr/lib64/nfs/xtab diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r10.ebuild