On Sun, 2010-04-18 at 12:08 +1000, Aníbal Monsalve Salazar wrote: > On Sat, Apr 17, 2010 at 01:40:10PM +0100, Ben Hutchings wrote: > >On Fri, 2010-04-16 at 08:45 -0700, Martin Michlmayr wrote: > >>On Fri, Apr 16, 2010 at 09:09:11AM +0100, John Winters wrote: > >>>2) Kernel 2.6.32-2 causes problems with Lenny running as an NFS > >>>server. The nfs-kernel-server startup scripts try to check whether > >>>the kernel is NFS-capable and erroneously decide it isn't. > >> > >>This has been fixed in unstable but I think it would be nice to push a > >>fix into lenny too since a lot of people run newer kernels on lenny. > >> > >>debian-kernel: any thoughts? > > > >Agreed. > > > >Aníbal, do you want to prepare this or shall I? > > Please go ahead. Thank you Ben. I don't have a lenny devel environment > right now and it'll take some time before I can build one. I'm intending to upload nfs-utils to stable-proposed-updates with the following changes, to support partial upgrades (specifically kernel upgrades). Please ack/nak. Ben. diff -u nfs-utils-1.1.2/debian/changelog nfs-utils-1.1.2/debian/changelog --- nfs-utils-1.1.2/debian/changelog +++ nfs-utils-1.1.2/debian/changelog @@ -1,3 +1,10 @@ +nfs-utils (1:1.1.2-6lenny2) stable; urgency=low + + * Update maintainers and uploaders to match unstable + * Fix test for NFS kernel server support in init script (Closes: #550153) + + -- Ben Hutchings <ben@decadent.org.uk> Sun, 18 Apr 2010 12:31:00 +0100 + nfs-utils (1:1.1.2-6lenny1) testing-proposed-updates; urgency=high * Fix CVE-2008-4552 diff -u nfs-utils-1.1.2/debian/control nfs-utils-1.1.2/debian/control --- nfs-utils-1.1.2/debian/control +++ nfs-utils-1.1.2/debian/control @@ -1,8 +1,8 @@ Source: nfs-utils Priority: standard Section: net -Maintainer: Anibal Monsalve Salazar <anibal@debian.org> -Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org> +Maintainer: Debian kernel team <debian-kernel@lists.debian.org> +Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk> Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev (>= 0.1-1), librpcsecgss-dev (>= 0.16-1), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40), libldap2-dev Standards-Version: 3.8.0.1 Homepage: http://nfs.sourceforge.net/ diff -u nfs-utils-1.1.2/debian/nfs-kernel-server.init nfs-utils-1.1.2/debian/nfs-kernel-server.init --- nfs-utils-1.1.2/debian/nfs-kernel-server.init +++ nfs-utils-1.1.2/debian/nfs-kernel-server.init @@ -64,7 +64,7 @@ do_modprobe nfsd # See if our running kernel supports the NFS kernel server - if [ -f /proc/kallsyms ] && ! grep -qE 'init_nf(sd| )' /proc/kallsyms; then + if ! grep -E -qs "[[:space:]]nfsd\$" /proc/filesystems; then log_warning_msg "Not starting $DESC: no support in current kernel." exit 0 fi --- END --- -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
Attachment:
signature.asc
Description: This is a digitally signed message part