From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Fixes for #11098 Date: Tue, 26 Apr 2016 22:22:40 +0100 Message-ID: <1461705760.10266.188.camel@ipfire.org> In-Reply-To: <1461597318-941-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0838973541807192833==" List-Id: --===============0838973541807192833== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Merged this, but had to fix the commit message so that it comes with a clue w= hat 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 > --- > =C2=A0config/rootfiles/packages/nfs=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2= =A05 +++-- > =C2=A0lfs/nfs=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A08 ++++---- > =C2=A0src/initscripts/init.d/nfs-server | 12 ++++++------ > =C2=A03 files changed, 13 insertions(+), 12 deletions(-) >=20 > 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 @@ > =C2=A0sbin/mount.nfs > =C2=A0sbin/mount.nfs4 > +sbin/nfsdcltrack > =C2=A0sbin/osd_login > =C2=A0sbin/umount.nfs > =C2=A0sbin/umount.nfs4 > @@ -22,7 +23,6 @@ usr/lib/libnfsidmap/umich_ldap.so > =C2=A0#usr/lib/pkgconfig/libnfsidmap.pc > =C2=A0usr/sbin/exportfs > =C2=A0usr/sbin/mountstats > -usr/sbin/nfsdcltrack > =C2=A0usr/sbin/nfsiostat > =C2=A0usr/sbin/nfsstat > =C2=A0usr/sbin/rpc.idmapd > @@ -37,6 +37,7 @@ usr/sbin/start-statd > =C2=A0#usr/share/man/man5/exports.5 > =C2=A0#usr/share/man/man5/idmapd.conf.5 > =C2=A0#usr/share/man/man5/nfs.5 > +#usr/share/man/man5/nfsmount.conf.5 > =C2=A0#usr/share/man/man7/nfsd.7 > =C2=A0#usr/share/man/man8/exportfs.8 > =C2=A0#usr/share/man/man8/idmapd.8 > @@ -61,7 +62,7 @@ usr/sbin/start-statd > =C2=A0var/lib/nfs/etab > =C2=A0var/lib/nfs/rmtab > =C2=A0var/lib/nfs/sm > -#var/lib/nfs/sm.bak > +var/lib/nfs/sm.bak > =C2=A0var/lib/nfs/state > =C2=A0var/lib/nfs/xtab > =C2=A0etc/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 @@ > =C2=A0 > =C2=A0include Config > =C2=A0 > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.2.7 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 1.3.3 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D nfs-utils-$(VER) > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.bz2 > @@ -32,7 +32,7 @@ DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D nfs > -PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 6 > +PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 7 > =C2=A0 > =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D "portmap" > =C2=A0 > @@ -48,7 +48,7 @@ objects =3D $(DL_FILE) \ > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0libnfsidmap-$(LIBNFSIDMAP).tar.gz =3D $(DL_FROM)/libnfsidmap- > $(LIBNFSIDMAP).tar.gz > =C2=A0 > -$(DL_FILE)_MD5 =3D 3b5ca797197765dc0c3a4122720c7716 > +$(DL_FILE)_MD5 =3D 9b87d890669eaaec8e97a2b0a35b2665 > =C2=A0libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 =3D 2ac4893c92716add1a1447ae01d= f77ab > =C2=A0 > =C2=A0install : $(TARGET) > @@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 --disable-gss \ > =C2=A0 --disable-tirpc \ > =C2=A0 --disable-nfsv41 \ > - --without-tcp-wrappers > + --without-tcp-wrappers --disable-ipv6 > =C2=A0 > =C2=A0 cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) > =C2=A0 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 @@ > =C2=A0 > =C2=A0case "$1" in > =C2=A0 start) > + boot_mesg "Mounting nfsd virtual filesystem..." > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0evaluate_retval > + > =C2=A0 boot_mesg "Starting NFS mountd..." > =C2=A0 loadproc /usr/sbin/rpc.mountd > =C2=A0 > @@ -27,10 +31,6 @@ case "$1" in > =C2=A0 loadproc /usr/sbin/rpc.rquotad > =C2=A0 fi > =C2=A0 > - boot_mesg "Mounting nfsd virtual filesystem..." > - /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null > - evaluate_retval > - > =C2=A0 # Make ceratin that the list is refreshed on > =C2=A0 # a restart. > =C2=A0 boot_mesg "Exporting NFS Filesystems..." > @@ -43,8 +43,8 @@ case "$1" in > =C2=A0 killproc /usr/sbin/rpc.statd > =C2=A0 > =C2=A0 boot_mesg "Stopping NFS nfsd..." > - # nfsd needs HUP.... > - killproc nfsd HUP > + /usr/sbin/rpc.nfsd 0 > + evaluate_retval > =C2=A0 > =C2=A0 boot_mesg "Stopping NFS mountd..." > =C2=A0 killproc /usr/sbin/rpc.mountd --===============0838973541807192833== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlhIOXdnQUFvSkVJQjU4UDl2a0FrSEFEQVFBSTRTM1RtSEtCdkR1UWJiemovTFUzNWUK aW82SHhPS0JYWnMrem4vSW1OV2h1aHdKVG9OR3Y0a3l1V1ZEK0tTbEFQeDNPN0ZlRUNYTGxla0sr cGlCNWJwQQpEejl2WHl2QklVTHl3blhyWXU2VDFQd0x1SHFjaUcwTUdaeS9XaElVMFh0R3h5ZWFt WmtDamNveFBlU0lraVZZCjVVQWh4V2t2TzV3QllQUE00alBNR28wdlRYVUUxdWtMQmhIQjB4allM VVBuLzFoNkFHcWFVa3ZncDlTdStybk8KTG1yZndJM1plYmRhSmdEV0JQbHkxRTMvUWg4bVhvQzdn SmRVbG52MyswVkpTZ25icGdzUzJBbkl5STBLRC82OQp2cytoaFFlOWFEckJOSnhuN2hYK08yaW9x d3E4QWpMUGRMR2tuVFdpVi96NnNyUXlyd1RXVllraVlLU1hZWnVTClVKRjN2QU5zb2xxMmJrK0NJ bWliTmEwd0RPUXVTSmppM3RNbkJNWW1adURXRmV0YWUxbGhFZEZSVTFjaXhudXkKclAzeS90bFQ0 Z3BhMHdzWWJ1UVVqTVZSQ0d2ZVl3bkM0eXRUNlE1WTJzMkMrZnRMcnVtei9UcHgrS0hLdmM2TApB Q1IzdTJrYndBRTg4QUJuQkJVY1hLeUQwaUx5NW5yOVZVWGkyTW9nb1dhWFlES3hVWlJRTGdnZG5U c1F3NTJ6CnR1ZFFFbHM2ZnNyVmxaM2pzM2JLZmdVTG10V1VzQXhGV3dpK3dKdGg3WjBzU1k2LzE5 OXZhRkNUQkYyRFZVdmoKdXFXKzl1eDYxMnBnNzdxbXk3VG4yK0lWRUNjbGJOQmVkMnZSMzRXVEgv cENCL2RCdkRWRjZXbjlxS0lCSFA4RgpPU2cyZnV4b0o5QkJSUnhxRTZZYgo9QXNMLwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============0838973541807192833==--