mbox

Fixes for #11098

Message ID 1461597318-941-1-git-send-email-jonatan.schlag@ipfire.org
State Accepted
Commit 54cc2c4e5d5abbc1972e9d996117f95d6522ade1
Headers

Message

Jonatan Schlag April 26, 2016, 1:15 a.m. UTC 
  Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 config/rootfiles/packages/nfs     |  5 +++--
 lfs/nfs                           |  8 ++++----
 src/initscripts/init.d/nfs-server | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

Comments

Michael Tremer April 27, 2016, 7:22 a.m. UTC | #1 
Merged this, but had to fix the commit message so that it comes with a clue what
was done here and I had to fix some whitespace issues.

Best,
-Michael

On Mon, 2016-04-25 at 17:15 +0200, Jonatan Schlag wrote:
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
>  config/rootfiles/packages/nfs     |  5 +++--
>  lfs/nfs                           |  8 ++++----
>  src/initscripts/init.d/nfs-server | 12 ++++++------
>  3 files changed, 13 insertions(+), 12 deletions(-)
> 
> diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
> index 666512b..08fcca9 100644
> --- a/config/rootfiles/packages/nfs
> +++ b/config/rootfiles/packages/nfs
> @@ -1,5 +1,6 @@
>  sbin/mount.nfs
>  sbin/mount.nfs4
> +sbin/nfsdcltrack
>  sbin/osd_login
>  sbin/umount.nfs
>  sbin/umount.nfs4
> @@ -22,7 +23,6 @@ usr/lib/libnfsidmap/umich_ldap.so
>  #usr/lib/pkgconfig/libnfsidmap.pc
>  usr/sbin/exportfs
>  usr/sbin/mountstats
> -usr/sbin/nfsdcltrack
>  usr/sbin/nfsiostat
>  usr/sbin/nfsstat
>  usr/sbin/rpc.idmapd
> @@ -37,6 +37,7 @@ usr/sbin/start-statd
>  #usr/share/man/man5/exports.5
>  #usr/share/man/man5/idmapd.conf.5
>  #usr/share/man/man5/nfs.5
> +#usr/share/man/man5/nfsmount.conf.5
>  #usr/share/man/man7/nfsd.7
>  #usr/share/man/man8/exportfs.8
>  #usr/share/man/man8/idmapd.8
> @@ -61,7 +62,7 @@ usr/sbin/start-statd
>  var/lib/nfs/etab
>  var/lib/nfs/rmtab
>  var/lib/nfs/sm
> -#var/lib/nfs/sm.bak
> +var/lib/nfs/sm.bak
>  var/lib/nfs/state
>  var/lib/nfs/xtab
>  etc/rc.d/init.d/nfs-server
> diff --git a/lfs/nfs b/lfs/nfs
> index 417f155..b6cef7b 100644
> --- a/lfs/nfs
> +++ b/lfs/nfs
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 1.2.7
> +VER        = 1.3.3
>  
>  THISAPP    = nfs-utils-$(VER)
>  DL_FILE    = $(THISAPP).tar.bz2
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = nfs
> -PAK_VER    = 6
> +PAK_VER    = 7
>  
>  DEPS       = "portmap"
>  
> @@ -48,7 +48,7 @@ objects = $(DL_FILE) \
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-
> $(LIBNFSIDMAP).tar.gz
>  
> -$(DL_FILE)_MD5 = 3b5ca797197765dc0c3a4122720c7716
> +$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665
>  libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
>  
>  install : $(TARGET)
> @@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  		--disable-gss \
>  		--disable-tirpc \
>  		--disable-nfsv41 \
> -		--without-tcp-wrappers
> +		--without-tcp-wrappers --disable-ipv6
>  
>  	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
>  	cd $(DIR_APP) && make install
> diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-
> server
> index 15284e8..73378d5 100644
> --- a/src/initscripts/init.d/nfs-server
> +++ b/src/initscripts/init.d/nfs-server
> @@ -13,6 +13,10 @@
>  
>  case "$1" in
>  	start)
> +		boot_mesg "Mounting nfsd virtual filesystem..."
> +                /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
> +                evaluate_retval
> +
>  		boot_mesg "Starting NFS mountd..."
>  		loadproc /usr/sbin/rpc.mountd
>  
> @@ -27,10 +31,6 @@ case "$1" in
>  			loadproc /usr/sbin/rpc.rquotad
>  		fi
>  
> -		boot_mesg "Mounting nfsd virtual filesystem..."
> -		/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
> -		evaluate_retval
> -
>  		# Make ceratin that the list is refreshed on
>  		# a restart.
>  		boot_mesg "Exporting NFS Filesystems..."
> @@ -43,8 +43,8 @@ case "$1" in
>  		killproc /usr/sbin/rpc.statd
>  
>  		boot_mesg "Stopping NFS nfsd..."
> -		# nfsd needs HUP....
> -		killproc nfsd HUP
> +		/usr/sbin/rpc.nfsd 0
> +		evaluate_retval
>  
>  		boot_mesg "Stopping NFS mountd..."
>  		killproc /usr/sbin/rpc.mountd