From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] nfs-utils: Update to 2.6.2
Date: Tue, 21 Feb 2023 15:45:51 +0100 [thread overview]
Message-ID: <20230221144552.857087-2-stefan.schantl@ipfire.org> (raw)
In-Reply-To: <20230221144552.857087-1-stefan.schantl@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 8478 bytes --]
* Provides libnfsidmap packages from now
* Drop systemd files because the package contains
their own
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
nfs-utils/nfs-utils.nm | 25 +++++++++++++++----
nfs-utils/systemd/nfs-blkmap.service | 12 ---------
nfs-utils/systemd/nfs-idmap.service | 12 ---------
nfs-utils/systemd/nfs-lock.service | 14 -----------
nfs-utils/systemd/nfs-mountd.service | 12 ---------
nfs-utils/systemd/nfs-rquotad.service | 12 ---------
nfs-utils/systemd/nfs-secure-server.service | 13 ----------
nfs-utils/systemd/nfs-secure.service | 12 ---------
nfs-utils/systemd/nfs-server.service | 18 -------------
nfs-utils/systemd/nfs.target | 7 ------
nfs-utils/systemd/proc-fs-nfsd.mount | 8 ------
.../systemd/var-lib-nfs-rpc_pipefs.mount | 8 ------
12 files changed, 20 insertions(+), 133 deletions(-)
delete mode 100644 nfs-utils/systemd/nfs-blkmap.service
delete mode 100644 nfs-utils/systemd/nfs-idmap.service
delete mode 100644 nfs-utils/systemd/nfs-lock.service
delete mode 100644 nfs-utils/systemd/nfs-mountd.service
delete mode 100644 nfs-utils/systemd/nfs-rquotad.service
delete mode 100644 nfs-utils/systemd/nfs-secure-server.service
delete mode 100644 nfs-utils/systemd/nfs-secure.service
delete mode 100644 nfs-utils/systemd/nfs-server.service
delete mode 100644 nfs-utils/systemd/nfs.target
delete mode 100644 nfs-utils/systemd/proc-fs-nfsd.mount
delete mode 100644 nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount
diff --git a/nfs-utils/nfs-utils.nm b/nfs-utils/nfs-utils.nm
index 07ac64ce1..f703bf53a 100644
--- a/nfs-utils/nfs-utils.nm
+++ b/nfs-utils/nfs-utils.nm
@@ -4,7 +4,7 @@
###############################################################################
name = nfs-utils
-version = 1.3.3
+version = 2.6.2
release = 1
groups = Networking/Tools
@@ -36,13 +36,14 @@ build
libcap-devel
libevent-devel
libgssglue-devel >= 0.3
+ libkeyutils-devel
libmount-devel
- libnfsidmap-devel
libtirpc-devel
libtool
+ rpcsvc-proto
shadow-utils
sqlite-devel
- systemd-units
+ systemd-devel
end
configure_options += \
@@ -50,9 +51,16 @@ build
--enable-libmount-mount \
--enable-mountconfig \
--enable-ipv6 \
- --with-statdpath=/var/lib/nfs/statd
+ --enable-gss \
+ --with-statedir=/var/lib/nfs \
+ --with-statdpath=/var/lib/nfs/statd \
+ --with-start-statd=/usr/bin/start-statd \
+ --with-systemd
prepare_cmds
+ # Install utils into correct place.
+ sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
+
sh autogen.sh
%{create_user}
@@ -96,7 +104,6 @@ packages
end
requires
- libnfsidmap >= 0.25
quota
rpcbind
util-linux
@@ -126,6 +133,14 @@ packages
end
end
+ package libnfsidmap
+ template LIBS
+ end
+
+ package libnfsidmap-devel
+ template DEVEL
+ end
+
package %{name}-debuginfo
template DEBUGINFO
end
diff --git a/nfs-utils/systemd/nfs-blkmap.service b/nfs-utils/systemd/nfs-blkmap.service
deleted file mode 100644
index 6b5127ba5..000000000
--- a/nfs-utils/systemd/nfs-blkmap.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=pNFS block layout mapping daemon
-Wants=var-lib-nfs-rpc_pipefs.mount
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/blkmapd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/nfs-utils/systemd/nfs-idmap.service b/nfs-utils/systemd/nfs-idmap.service
deleted file mode 100644
index e0c18037d..000000000
--- a/nfs-utils/systemd/nfs-idmap.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFSv4 ID-name mapping daemon
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/rpc.idmapd
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-utils/systemd/nfs-lock.service b/nfs-utils/systemd/nfs-lock.service
deleted file mode 100644
index fa991e5c1..000000000
--- a/nfs-utils/systemd/nfs-lock.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NFS file locking service.
-Requires=rpcbind.service network.target
-After=network.target named.service rpcbind.service
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStartPre=/usr/lib/nfs-utils/scripts/nfs-lock.preconfig
-ExecStart=/sbin/rpc.statd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/nfs-utils/systemd/nfs-mountd.service b/nfs-utils/systemd/nfs-mountd.service
deleted file mode 100644
index 32e1638c7..000000000
--- a/nfs-utils/systemd/nfs-mountd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/rpc.mountd
-StandardError=syslog+console
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-utils/systemd/nfs-rquotad.service b/nfs-utils/systemd/nfs-rquotad.service
deleted file mode 100644
index ab1d2078e..000000000
--- a/nfs-utils/systemd/nfs-rquotad.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Remote Quota Server
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=-/usr/sbin/rpc.rquotad
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-utils/systemd/nfs-secure-server.service b/nfs-utils/systemd/nfs-secure-server.service
deleted file mode 100644
index b88bab55c..000000000
--- a/nfs-utils/systemd/nfs-secure-server.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Secure NFS Server
-Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service
-After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/rpc.svcgssd
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/nfs-utils/systemd/nfs-secure.service b/nfs-utils/systemd/nfs-secure.service
deleted file mode 100644
index 2a7dfb678..000000000
--- a/nfs-utils/systemd/nfs-secure.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Secure NFS
-Requires=var-lib-nfs-rpc_pipefs.mount
-After=syslog.target var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-StandardError=syslog+console
-ExecStart=/usr/sbin/rpc.gssd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/nfs-utils/systemd/nfs-server.service b/nfs-utils/systemd/nfs-server.service
deleted file mode 100644
index 79d114e0d..000000000
--- a/nfs-utils/systemd/nfs-server.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=NFS Server
-Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
-Requires=nfs-idmap.service nfs-mountd.service nfs-rquotad.service
-After=network.target named.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-StandardError=syslog+console
-ExecStartPre=/usr/sbin/exportfs -r
-ExecStart=/usr/sbin/rpc.nfsd
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -f
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/nfs-utils/systemd/nfs.target b/nfs-utils/systemd/nfs.target
deleted file mode 100644
index 6c3262a76..000000000
--- a/nfs-utils/systemd/nfs.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Network File System Server
-Requires=var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service
-After=network.target named.service
-
-[Install]
-WantedBy=multi-user.target
diff --git a/nfs-utils/systemd/proc-fs-nfsd.mount b/nfs-utils/systemd/proc-fs-nfsd.mount
deleted file mode 100644
index e5ee6fbf6..000000000
--- a/nfs-utils/systemd/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=nfsd
diff --git a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount b/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644
index d27e1a26a..000000000
--- a/nfs-utils/systemd/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs
--
2.30.2
next prev parent reply other threads:[~2023-02-21 14:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 14:45 [PATCH 1/3] keyutils: New package Stefan Schantl
2023-02-21 14:45 ` Stefan Schantl [this message]
2023-02-21 14:45 ` [PATCH 3/3] libnfsidmap: Drop package Stefan Schantl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230221144552.857087-2-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox