summaryrefslogtreecommitdiffstats
path: root/projectroot
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-12-29 16:45:12 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-01-12 14:47:50 +0100
commitc0062c3be5fd17c93a7c9d9896d69a67d14452b5 (patch)
tree51980edf1d9a267c567b1f124a78ec1140e6ba57 /projectroot
parenta474cfd1414bd01daf235c3cec71056713315d8a (diff)
downloadptxdist-c0062c3be5fd17c93a7c9d9896d69a67d14452b5.tar.gz
ptxdist-c0062c3be5fd17c93a7c9d9896d69a67d14452b5.tar.xz
nfsutils: version bump 1.3.0 -> 1.3.3
Cleanup and simplify rules while at it. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r--projectroot/etc/exports0
-rw-r--r--projectroot/lib/systemd/system/nfs.target5
-rw-r--r--projectroot/lib/systemd/system/rpc-statd.service10
-rw-r--r--projectroot/lib/systemd/system/var-lib-nfs.mount8
-rw-r--r--projectroot/usr/lib/tmpfiles.d/nfs.conf12
5 files changed, 14 insertions, 21 deletions
diff --git a/projectroot/etc/exports b/projectroot/etc/exports
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/projectroot/etc/exports
diff --git a/projectroot/lib/systemd/system/nfs.target b/projectroot/lib/systemd/system/nfs.target
deleted file mode 100644
index ea1b87c9c..000000000
--- a/projectroot/lib/systemd/system/nfs.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=NFS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/projectroot/lib/systemd/system/rpc-statd.service b/projectroot/lib/systemd/system/rpc-statd.service
deleted file mode 100644
index 3c2bb2c71..000000000
--- a/projectroot/lib/systemd/system/rpc-statd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=NFS status monitor for NFSv2/3 locking.
-DefaultDependencies=no
-Conflicts=umount.target
-Requires=nss-lookup.target rpcbind.target
-After=network.target nss-lookup.target rpcbind.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/rpc.statd --no-notify
diff --git a/projectroot/lib/systemd/system/var-lib-nfs.mount b/projectroot/lib/systemd/system/var-lib-nfs.mount
new file mode 100644
index 000000000..21da80b75
--- /dev/null
+++ b/projectroot/lib/systemd/system/var-lib-nfs.mount
@@ -0,0 +1,8 @@
+[Unit]
+Before=local-fs.target
+
+[Mount]
+What=tmpfs
+Where=/var/lib/nfs
+Type=tmpfs
+Options=nosuid,nodev,noexec,mode=0755,size=1M
diff --git a/projectroot/usr/lib/tmpfiles.d/nfs.conf b/projectroot/usr/lib/tmpfiles.d/nfs.conf
index 593d7cd45..e37b7f494 100644
--- a/projectroot/usr/lib/tmpfiles.d/nfs.conf
+++ b/projectroot/usr/lib/tmpfiles.d/nfs.conf
@@ -1,6 +1,6 @@
-d /var/lib/nfs 0755 @RPCUSER@ root -
-f /var/lib/nfs/etab 0644 @RPCUSER@ root -
-f /var/lib/nfs/rmtab 0644 @RPCUSER@ root -
-f /var/lib/nfs/xtab 0600 @RPCUSER@ root -
-d /var/lib/nfs/sm 0700 @RPCUSER@ root -
-d /var/lib/nfs/sm.bak 0700 @RPCUSER@ root -
+d /var/lib/nfs 0755 rpcuser root -
+f /var/lib/nfs/etab 0644 rpcuser root -
+f /var/lib/nfs/rmtab 0644 rpcuser root -
+f /var/lib/nfs/xtab 0600 rpcuser root -
+d /var/lib/nfs/sm 0700 rpcuser root -
+d /var/lib/nfs/sm.bak 0700 rpcuser root -