diff --git a/srcpkgs/nfs-utils/files/blkmapd.service b/srcpkgs/nfs-utils/files/blkmapd.service deleted file mode 100644 index 81f7945bfa4..00000000000 --- a/srcpkgs/nfs-utils/files/blkmapd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=NFS block layout mapping daemon -After=var-lib-nfs-rpc_pipefs.mount nfsd.service -Requires=var-lib-nfs-rpc_pipefs.mount - -[Service] -Type=forking -ExecStart=/usr/bin/blkmapd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/files/nfsd.service b/srcpkgs/nfs-utils/files/nfsd.service deleted file mode 100644 index adeb8fc3360..00000000000 --- a/srcpkgs/nfs-utils/files/nfsd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=NFS server -After=rpcbind.service -Requires=rpcbind.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/rpc.nfsd -ExecStartPost=/usr/bin/exportfs -a -ExecStop=/usr/bin/rpc.nfsd 0 -ExecStopPost=/usr/bin/exportfs -a -u -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount b/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount deleted file mode 100644 index 5993bb12929..00000000000 --- a/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=NFS Daemon filesystem -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/proc/fs/nfsd -Type=nfsd diff --git a/srcpkgs/nfs-utils/files/rpc-gssd.service b/srcpkgs/nfs-utils/files/rpc-gssd.service deleted file mode 100644 index 83370c2c9b8..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-gssd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=RPC GSS-API client-side daemon -After=rpcbind.service var-lib-nfs-rpc_pipefs.mount -Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target - -[Service] -Type=forking -ExecStart=/usr/bin/rpc.gssd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/files/rpc-idmapd.service b/srcpkgs/nfs-utils/files/rpc-idmapd.service deleted file mode 100644 index 5198e460ac8..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-idmapd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFSv4 ID-name mapping daemon -After=var-lib-nfs-rpc_pipefs.mount nfsd.service -Requires=var-lib-nfs-rpc_pipefs.mount -Before=remote-fs-pre.target - -[Service] -Type=forking -ExecStart=/usr/bin/rpc.idmapd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/files/rpc-mountd.service b/srcpkgs/nfs-utils/files/rpc-mountd.service deleted file mode 100644 index 7e4900000b5..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-mountd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=NFSv2/3 Mount Daemon -After=rpcbind.service nfsd.service -Requires=rpcbind.service nfsd.service - -[Service] -Type=forking -ExecStart=/usr/bin/rpc.mountd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/files/rpc-statd.service b/srcpkgs/nfs-utils/files/rpc-statd.service deleted file mode 100644 index 050c2064f75..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-statd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=NFSv2/3 Network Status Monitor Daemon -After=rpcbind.service -Requires=rpcbind.service -Before=remote-fs-pre.target - -[Service] -Type=forking -ExecStart=/usr/bin/rpc.statd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/files/rpc-svcgssd.service b/srcpkgs/nfs-utils/files/rpc-svcgssd.service deleted file mode 100644 index 97fca434d50..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-svcgssd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=RPC GSS-API server-side daemon -After=rpcbind.service -Requires=rpcbind.service - -[Service] -Type=forking -ExecStart=/usr/bin/rpc.svcgssd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount b/srcpkgs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount deleted file mode 100644 index 4bd440f24e0..00000000000 --- a/srcpkgs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPC pipe filesystem - -[Mount] -What=rpc_pipefs -Where=/var/lib/nfs/rpc_pipefs -Type=rpc_pipefs diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index e8159364dfc..23110ad7ce1 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,7 +1,7 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.3.2 -revision=3 +revision=4 short_desc="Network File System utilities" maintainer="Juan RP " license="GPL-2" @@ -49,11 +49,6 @@ do_install() { # runit services vsv statd vsv nfs-server - # systemd glue - if [ "$build_option_systemd" ]; then - vmkdir usr/lib/systemd/system - install -m644 ${FILESDIR}/*.{service,mount} ${DESTDIR}/usr/lib/systemd/system - fi rm -rf ${DESTDIR}/var/lib/nfs }