From d3dcf7a556c2782f02ac275c0c1b708c324b5541 Mon Sep 17 00:00:00 2001 From: Anibal Monsalve Salazar Date: Thu, 14 Jan 2010 16:15:44 +1100 Subject: [PATCH] Imported Debian patch 1.2.1-3 --- debian/changelog | 8 ++++++++ debian/control | 2 +- debian/nfs-kernel-server.init | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2f008f..faa81b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +nfs-utils (1:1.2.1-3) unstable; urgency=low + + * Change the reading of /proc/kallsyms + Closes: 561674, 554508 + * nfs-kernel-server depends on nfs-common (= ${binary:Version}) + + -- Anibal Monsalve Salazar Thu, 14 Jan 2010 16:15:44 +1100 + nfs-utils (1:1.2.1-2) unstable; urgency=low * Go back to read /proc/kallsyms diff --git a/debian/control b/debian/control index 8be6752..5a43c3d 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Homepage: http://nfs.sourceforge.net/ Package: nfs-kernel-server Priority: optional Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-2) +Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3), libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-2) Provides: knfs, nfs-server Conflicts: knfs, nfs-server Replaces: knfs, nfs-server diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init index 4291e09..1da9b46 100644 --- a/debian/nfs-kernel-server.init +++ b/debian/nfs-kernel-server.init @@ -64,7 +64,7 @@ case "$1" in do_modprobe nfsd # See if our running kernel supports the NFS kernel server - if [ -f /proc/kallsyms ] && ! grep -Eqm1 ' nfsd_.* *\[nfsd\]' /proc/kallsyms; then + if [ -f /proc/kallsyms ] && ! grep -Eq "[[:space:]]nfsd_open([[:space:]]|$)" /proc/kallsyms; then log_warning_msg "Not starting $DESC: no support in current kernel." exit 0 fi -- 2.39.2