- added systemd packages

- simplified sysconfigs and SysV init scripts for compatibility with systemd
- added triggers for changed sysconfigs

Changed files:
    nfs-utils.spec -> 1.219
    nfs.init -> 1.54
    nfs.sysconfig -> 1.9
    nfsfs.sysconfig -> 1.10
    nfslock.init -> 1.25
    nfslock.sysconfig -> 1.6

diff --git a/nfs-utils.spec b/nfs-utils.spec
index f71a41a2f15e40a7b03a8a90dcf2ff56c972b1ea..436bf53064fe0f0d01bc77c1cd2350cf1db90d7c 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -13,7 +13,7 @@ Summary(ru.UTF-8):    Утилиты для NFS и демоны поддержки
 Summary(uk.UTF-8):     Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:          nfs-utils
 Version:       1.2.5
-Release:       3
+Release:       3.1
 License:       GPL v2
 Group:         Networking/Daemons
 #Source0:      http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
@@ -32,6 +32,19 @@ Source8:     nfs.sysconfig
 Source9:       nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Source11:      blkmapd.init
+Source100:     proc-fs-nfsd.mount
+Source101:     var-lib-nfs-rpc_pipefs.mount
+Source102:     nfsd.service
+Source103:     nfs-blkmapd.service
+Source104:     nfs-exportfs.service
+Source105:     nfs-gssd.service
+Source106:     nfs-idmapd.service
+Source107:     nfs-lock.service
+Source108:     nfs-mountd.service
+Source109:     nfs-svcgssd.service
+Source110:     nfsd.postconfig
+Source111:     nfsd.preconfig
+Source112:     nfs-lock.preconfig
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-statdpath.patch
 Patch2:                %{name}-subsys.patch
@@ -64,6 +77,7 @@ BuildRequires:        libgssglue-devel >= 0.3
 %else
 BuildRequires: heimdal-devel >= 1.0
 %endif
+BuildRequires: rpmbuild(macros) >= 1.623
 # lucid context fields mismatch with current version of spkm3.h
 BuildConflicts:        gss_mech_spkm3-devel
 Requires(post):        fileutils
@@ -107,6 +121,20 @@ do Linux.
 супутні утиліти, які забезпечують набагато більшу продуктивність, ніж
 традиційні Linux NFS-сервери, які використовує більшість користувачів.
 
+%package systemd
+Summary:       systemd units for NFS server services
+Summary(pl.UTF-8):     Jednostki systemd dla serwisów serwera NFS
+Group:         Daemons
+Requires:      %{name} = %{version}-%{release}
+Requires:      systemd
+Requires:      systemd-units
+
+%description systemd
+Systemd units for NFS server services.
+
+%description systemd -l pl.UTF-8
+Jednostki systemd dla serwisów serwera NFS.
+
 %package clients
 Summary:       Clients for connecting to a remote NFS server
 Summary(pl.UTF-8):     Klienci do łączenia się ze zdalnym serwerem NFS
@@ -136,6 +164,20 @@ hoście. Na przykład, showmount potrafi pokazać klientów, którzy są
 zamountowani na tym serwerze. Ten pakiet nie jest konieczny do
 zamountowania zasobów NFS.
 
+%package clients-systemd
+Summary:       systemd units for NFS clients
+Summary(pl.UTF-8):     Jednostki systemd dla klientów NFS
+Group:         Daemons
+Requires:      %{name}-clients = %{version}-%{release}
+Requires:      systemd
+Requires:      systemd-units
+
+%description clients-systemd
+Systemd units for NFS clients.
+
+%description clients-systemd -l pl.UTF-8
+Jednostki systemd dla klientów NFS.
+
 %package common
 Summary:       Common programs for NFS
 Summary(pl.UTF-8):     Wspólne programy do obsługi NFS
@@ -159,6 +201,20 @@ Common programs for NFS.
 %description common -l pl.UTF-8
 Wspólne programy do obsługi NFS.
 
+%package common-systemd
+Summary:       systemd units for common NFS services
+Summary(pl.UTF-8):     Jednostki systemd dla wspólnych serwisów NFS
+Group:         Daemons
+Requires:      %{name}-common = %{version}-%{release}
+Requires:      systemd
+Requires:      systemd-units
+
+%description common-systemd
+Systemd units for common NFS services.
+
+%description common-systemd -l pl.UTF-8
+Jednostki systemd dla wspólnych serwisów NFS.
+
 %prep
 %setup -q -a1
 %patch0 -p1
@@ -201,7 +257,8 @@ Wspólne programy do obsługi NFS.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d} \
-       $RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery}
+       $RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery} \
+       $RPM_BUILD_ROOT{%{systemdunitdir},%{_datadir}/nfs-utils}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -231,6 +288,20 @@ install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/nfsd
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfslock
 install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 
+install %{SOURCE100} $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
+install %{SOURCE101} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
+install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-blkmapd.service
+install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-exportfs.service
+install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-gssd.service
+install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-idmapd.service
+install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-lock.service
+install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-mountd.service
+install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-svcgssd.service
+install %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.postconfig
+install %{SOURCE111} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.preconfig
+install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfs-lock.preconfig
+
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
@@ -266,6 +337,21 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del svcgssd
 fi
 
+%post systemd
+%systemd_post nfsd.service
+%systemd_post nfs-exportfs.service
+%systemd_post nfs-mountd.service
+%systemd_post nfs-svcgssd.service
+
+%preun systemd
+%systemd_preun nfsd.service
+%systemd_preun nfs-exportfs.service
+%systemd_preun nfs-mountd.service
+%systemd_preun nfs-svcgssd.service
+
+%postun systemd
+%systemd_reload
+
 %post clients
 /sbin/chkconfig --add nfsfs
 %service nfsfs restart
@@ -284,6 +370,17 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del blkmapd
 fi
 
+%post clients-systemd
+%systemd_post nfs-blkmapd.service
+%systemd_post nfs-gssd.service
+
+%preun clients-systemd
+%systemd_preun nfs-blkmapd.service
+%systemd_preun nfs-gssd.service
+
+%postun clients-systemd
+%systemd_reload
+
 %pre common
 %groupadd -g 191 rpcstatd
 %useradd -u 191 -d /var/lib/nfs/statd -s /bin/false -c "RPC statd user" -g rpcstatd rpcstatd
@@ -308,12 +405,52 @@ if [ "$1" = "0" ]; then
        %groupremove rpcstatd
 fi
 
+%post common-systemd
+%systemd_post nfs-idmapd.service
+%systemd_post nfs-lock.service
+
+%preun common-systemd
+%systemd_preun nfs-idmapd.service
+%systemd_preun nfs-lock.service
+
+%postun common-systemd
+%systemd_reload
+
+%triggerpostun -- %{name} < 1.2.5-4
+if [ -f /etc/sysconfig/nfsd ]; then
+       . /etc/sysconfig/nfsd
+       __RPCMOUNTOPTIONS=
+       [ -n "$MOUNTD_PORT" ] && __RPCMOUNTOPTIONS="-p $MOUNTD_PORT"
+       for vers in 2 3 4 ; do
+               __var=$(eval echo \$NFSv$vers)
+               [ -n "$__var" -a "$__var" != "yes" ] && \
+                       __RPCMOUNTOPTIONS="$__RPCMOUNTOPTIONS --no-nfs-version $vers"
+       done
+       [ -z "$__RPCMOUNTOPTIONS" ] && exit 0
+       cp -f /etc/sysconfig/nfsd{,.rpmsave}
+       echo >>/etc/sysconfig/nfsd
+       echo "# Added by rpm trigger" >>/etc/sysconfig/nfsd
+       echo "RPCMOUNTOPTIONS=$RPCMOUNTOPTIONS $__RPCMOUNTOPTIONS" >>/etc/sysconfig/nfsd
+fi
+
 %triggerpostun common -- %{name}-lock < 1.2.5-3
 if [ -f /etc/sysconfig/nfslock.rpmsave ]; then
        mv -f /etc/sysconfig/nfslock{,.rpmnew}
        mv -f /etc/sysconfig/nfslock.rpmsave /etc/sysconfig/nfslock
 fi
 
+%triggerpostun common -- %{name}-common < 1.2.5-4
+if [ -f /etc/sysconfig/nfslock ]; then
+       . /etc/sysconfig/nfslock
+       [ -n "$STATD_PORT" ] && STATDOPTS="$STATDOPTS -p $STATD_PORT"
+       [ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
+       [ -z "$STATDOPTS" ] && exit 0
+       cp -f /etc/sysconfig/nfslock{,.rpmsave}
+       echo >>/etc/sysconfig/nfslock
+       echo "# Added by rpm trigger" >>/etc/sysconfig/nfslock
+       echo "STATDOPTIONS=$STATDOPTS" >>/etc/sysconfig/nfslock
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README html
@@ -348,6 +485,16 @@ fi
 %{_mandir}/man8/rpcdebug.8*
 %{_mandir}/man8/svcgssd.8*
 
+%files systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/nfsd.service
+%{systemdunitdir}/nfs-exportfs.service
+%{systemdunitdir}/nfs-mountd.service
+%{systemdunitdir}/nfs-svcgssd.service
+%{systemdunitdir}/proc-fs-nfsd.mount
+%attr(755,root,root) %{_datadir}/nfs-utils/nfsd.postconfig
+%attr(755,root,root) %{_datadir}/nfs-utils/nfsd.preconfig
+
 %files clients
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/blkmapd
@@ -374,6 +521,11 @@ fi
 %{_mandir}/man8/showmount.8*
 %{_mandir}/man8/umount.nfs.8*
 
+%files clients-systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/nfs-blkmapd.service
+%{systemdunitdir}/nfs-gssd.service
+
 %files common
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock
@@ -401,3 +553,11 @@ fi
 %{_mandir}/man8/rpc.statd.8*
 %{_mandir}/man8/sm-notify.8*
 %{_mandir}/man8/statd.8*
+
+%files common-systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/nfs-idmapd.service
+%{systemdunitdir}/nfs-lock.service
+%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+%dir %{_datadir}/nfs-utils
+%attr(755,root,root) %{_datadir}/nfs-utils/nfs-lock.preconfig

diff --git a/nfs.init b/nfs.init
index 08d2893fb550daa2550eee553fcff2f2d30050a6..e8ed54a90397df9cce41707a8e3de5f71e3e384b 100644 (file)
--- a/nfs.init
+++ b/nfs.init
@@ -19,10 +19,6 @@
 [ -f /etc/sysconfig/nfslock ] && . /etc/sysconfig/nfslock
 [ -f /etc/sysconfig/nfsd ] && . /etc/sysconfig/nfsd
 
-[ -n "$NFSv2" ] || NFSv2="yes"
-[ -n "$NFSv3" ] || NFSv3="yes"
-[ -n "$NFSv4" ] || NFSv4="yes"
-
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
@@ -57,13 +53,6 @@ start() {
                /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
        fi
 
-       for vers in 2 3 4 ; do
-               is_yes $(eval echo \$NFSv$vers) || \
-                       RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS --no-nfs-version $vers"
-       done
-
-       [ -n "$MOUNTD_PORT" ] && RPCMOUNTOPTIONS="$RPCMOUNTOPTIONS -p $MOUNTD_PORT"
-
        # Start daemons.
        msg_starting "NFS exportfs"
        daemon /usr/sbin/exportfs -r

diff --git a/nfs.sysconfig b/nfs.sysconfig
index 4e09b578bfeac52fdf4c42ce0f3e64bc867ac0f5..0cb385a490a4bd8d7690fdfd91e2d633a897da91 100644 (file)
--- a/nfs.sysconfig
+++ b/nfs.sysconfig
@@ -4,22 +4,8 @@ SERVICE_RUN_NICE_LEVEL="+0"
 # Number of NFSD servers to start
 RPCNFSDCOUNT=8
 
-# NFS versions to use (default all-yes)
-NFSv2="yes"
-NFSv3="yes"
-NFSv4="yes"
-
-# Port mount should listen on (default is portmap assigned)
-#MOUNTD_PORT=
-
 # Options for NFS rpc.mountd
-#RPCMOUNTOPTIONS=""
-
-# Uncomment if you want to use secure NFSv4 exports
-#SECURE_NFS="yes"
-
-# List of kernel modules to use for secure NFS
-#SECURE_NFS_MODS="des rpcsec_gss_krb5"
+#RPCMOUNTOPTIONS=
 
 # Options for NFSv4 server-side rpcsec_gss daemon
 #RPCSVCGSSOPTIONS=

diff --git a/nfsfs.sysconfig b/nfsfs.sysconfig
index 3c078b8f1746361faa05674c8ee2b66b1d3428ea..f4598292d4805f1b98ba7b46cdae7a772ae15133 100644 (file)
--- a/nfsfs.sysconfig
+++ b/nfsfs.sysconfig
@@ -1,18 +1,9 @@
 # Options for NFSv4 ID <-> Name Mapper (idmapd)
 #RPCIDMAPOPTIONS=
 
-# Uncomment if you want to use secure NFSv4 exports
-#SECURE_NFS="yes"
-
-# List of kernel modules to use for secure NFS
-#SECURE_NFS_MODS="des rpcsec_gss_krb5"
-
 # Options for NFSv4 rpcsec_gss daemon
 #RPCGSSOPTIONS=
 
-# Uncomment if you want to mount pNFS volumes
-#ENABLE_PNFS=yes
-
 # Options for pNFS blkmapd daemon
 #BLKMAPDOPTIONS=
 

diff --git a/nfslock.init b/nfslock.init
index 6383e672769fcffcc6776e32bbf9ce83ec7ac49a..748f9863672b1b9ba76c1371949e854d258d53e8 100644 (file)
--- a/nfslock.init
+++ b/nfslock.init
@@ -52,13 +52,10 @@ start() {
                /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1
        fi
 
-       [ -n "$STATD_PORT" ] && STATDOPTS="$STATDOPTS -p $STATD_PORT"
-       [ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
-
        # Start daemons.
        # Don't put sm-notify here, statd will run it when started
        msg_starting "RPC statd"
-       daemon /usr/sbin/rpc.statd $STATDOPTS
+       daemon /usr/sbin/rpc.statd $STATDOPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nfslock
 }

diff --git a/nfslock.sysconfig b/nfslock.sysconfig
index bb1f2010ff051e1656b980dd507bdd94cb722fb6..2ba264d4da8094af0b2ff86c9db51b327d0e51fb 100644 (file)
--- a/nfslock.sysconfig
+++ b/nfslock.sysconfig
@@ -5,11 +5,5 @@ SERVICE_RUN_NICE_LEVEL="+0"
 #LOCKD_TCPPORT=
 #LOCKD_UDPPORT=
 
-# Port for rpc.statd to listen on (default is portmap assigned)
-#STATD_PORT=
-
-# Port for rpc.statd to send outgoing status requests from
-#STATD_OUTPORT=
-
 # Options for rpc.statd.
-#STATDOPTS=
+#STATDOPTIONS=