2002-08-26 Chip Salzenberg <chip@pobox.com>

	* utils/nfsd/nfsd.man: Fix typo.
	* debian/changelog: Version 1.0.1-1.

diff --git a/ChangeLog b/ChangeLog
index 054b39e7f9d8a6f042f818b416141448fec8133c..c50ca92025eb5be497d07d8e8bd6a7dbe7505ea0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-26  Chip Salzenberg  <chip@pobox.com>
+
+       * utils/nfsd/nfsd.man: Fix typo.
+       * debian/changelog: Version 1.0.1-1.
+

 2002-05-29 NeilBrown <neilb@cse.unsw.edu.au>
 
        * let parseopts know if /etc/exports was being read or not, 
 2002-05-29 NeilBrown <neilb@cse.unsw.edu.au>
 
        * let parseopts know if /etc/exports was being read or not, 

diff --git a/debian/changelog b/debian/changelog
index f09bf9053e6b97ce6952d695257afa825aca6090..ce71df2cd7df148ccf67647405272c5b555c2e51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+nfs-utils (1:1.0.1-1) unstable; urgency=low
+
+  * New upstream version:
+    > BIG CHANGE: Exports default to "sync", that is, synchronous writes.
+      This is safer but MUCH SLOWER than the old default of "async".
+      All exports should be marked as either "sync" or "async" to avoid a
+      warning from exportfs.
+  * Patches from CVS through 2002-08-26.
+  * Let init script start statd on a specific port.  (closes: #144344)
+  * Fix typo in debconf message about tcpwrappers.  (closes: #128709)
+  * Fix typo in rpc.nfsd(8).  (closes: #152556)
+  * Add Russian templates.  (closes: #136599, #136932)
+
+ -- Chip Salzenberg <chip@debian.org>  Mon, 26 Aug 2002 12:17:57 -0400
+

 nfs-utils (1:1.0-2) unstable; urgency=low
 
   * Fail an export if its mapping option is unsupported.  (closes: #85678)
 nfs-utils (1:1.0-2) unstable; urgency=low
 
   * Fail an export if its mapping option is unsupported.  (closes: #85678)

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 31357bd3543ff1df58d49b66a311776a1a55b81f..2ae17b3e1b165b263a1ee9948275291ac021250e 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -11,6 +11,10 @@
 
 PREFIX=
 
 
 PREFIX=
 

+# Should rpc.statd listen on a specific port?
+# If so, set this variable to a statd argument like: "--port 1000".
+STATDPORT=""
+

 NEED_LOCKD=yes
 if test -f /proc/ksyms
 then
 NEED_LOCKD=yes
 if test -f /proc/ksyms
 then


@@ -32,7 +36,7 @@ case "$1" in
        printf "Starting $DESC:"
        printf " statd"
        start-stop-daemon --start --quiet \
        printf "Starting $DESC:"
        printf " statd"
        start-stop-daemon --start --quiet \

-           --exec $PREFIX/sbin/rpc.statd
+           --exec $PREFIX/sbin/rpc.statd -- $STATDPORT

        if [ "$NEED_LOCKD" = yes ]
        then
            printf " lockd"
        if [ "$NEED_LOCKD" = yes ]
        then
            printf " lockd"

diff --git a/debian/nfs-common.templates b/debian/nfs-common.templates
index 5046bfaa8a6c75c869982588cc19a0fc49fa1fc3..fe11b12e2d5efa9d73ba3687fb2f8fe4ebf546dc 100644 (file)
--- a/debian/nfs-common.templates
+++ b/debian/nfs-common.templates
@@ -7,3 +7,7 @@ Description-de: statd benutzt tcpwrappers
  Der statd-Daemon benutzt tcpwrappers für die Zugriffskontrolle. Um
  diesen zu konfigurieren, benutzen Sie den Namen "statd" in den Dateien
  /etc/hosts.allow und /etc/hosts.deny.
  Der statd-Daemon benutzt tcpwrappers für die Zugriffskontrolle. Um
  diesen zu konfigurieren, benutzen Sie den Namen "statd" in den Dateien
  /etc/hosts.allow und /etc/hosts.deny.

+Description-ru: statd ÉÓÐÏÌØÚÕÅÔ tcp-×ÒÁÐÐÅÒÙ
+ äÅÍÏÎ  statd  ÉÓÐÏÌØÚÕÅÔ  tcp-×ÒÁÐÐÅÒÙ  ÄÌÑ ÕÐÒÁ×ÌÅÎÉÑ ÄÏÓÔÕÐÏÍ. þÔÏÂÙ
+ ÎÁÓÔÒÏÉÔØ  ×ÒÁÐÐÅÒ,   ÉÓÐÏÌØÚÕÊÔÅ   ÉÍÑ  ÐÒÏÇÒÁÍÍÙ  "statd"  ×  ÆÁÊÌÁÈ
+ /etc/hosts.allow É /etc/hosts.deny.

diff --git a/debian/nfs-kernel-server.config b/debian/nfs-kernel-server.config
index 86981299aa1f9f0260d0ed0a8418779eca4de380..de5df5816887f90ad99cd1c771b6e012b2ec9473 100644 (file)
--- a/debian/nfs-kernel-server.config
+++ b/debian/nfs-kernel-server.config
@@ -2,6 +2,11 @@
 
 . /usr/share/debconf/confmodule
 
 
 . /usr/share/debconf/confmodule
 

+if grep -s '^/' /etc/exports | grep -vq sync
+then
+    db_input high nfs-kernel-server/sync-default || true
+fi
+

 if fgrep -q 'rpc' /etc/hosts.allow /etc/hosts.deny
 then
     db_input high nfs-kernel-server/tcpwrappers-mountd || true
 if fgrep -q 'rpc' /etc/hosts.allow /etc/hosts.deny
 then
     db_input high nfs-kernel-server/tcpwrappers-mountd || true

diff --git a/debian/nfs-kernel-server.templates b/debian/nfs-kernel-server.templates
index 6e9513989ff1f9a4d81532d736608844e3d03406..9596aa20901ea1cc79ff68e5fc8b8396fce4e3f4 100644 (file)
--- a/debian/nfs-kernel-server.templates
+++ b/debian/nfs-kernel-server.templates
@@ -1,8 +1,16 @@
+Template: nfs-kernel-server/sync-default
+Type: note
+Description: To comply with standards and increase data safety,
+ the Linux NFS server now defaults to synchronous writes.  Since
+ this is a major change, it is not silent:  All exports should be
+ explicitly marked as either "sync" or "async".  Exports not so
+ marked will elicit warnings.
+

 Template: nfs-kernel-server/tcpwrappers-mountd
 Type: note
 Description: in /etc/hosts.{allow,deny}, replace "rpc.mountd" with "mountd"
  The mount daemon uses tcpwrappers to control access.  To configure
 Template: nfs-kernel-server/tcpwrappers-mountd
 Type: note
 Description: in /etc/hosts.{allow,deny}, replace "rpc.mountd" with "mountd"
  The mount daemon uses tcpwrappers to control access.  To configure

- it, use program name "mount" in /etc/hosts.allow and /etc/hosts.deny.
+ it, use program name "mountd" in /etc/hosts.allow and /etc/hosts.deny.

  .
  Older versions of nfs-kernel-server included a mount daemon that
  called itself "rpc.mountd".  Therefore, you should replace all
  .
  Older versions of nfs-kernel-server included a mount daemon that
  called itself "rpc.mountd".  Therefore, you should replace all


@@ -15,3 +23,12 @@ Description-de: "rpc.mountd" mit "mountd" in /etc/hosts.{allow,deny} ersetzen
  .
  Deshalb sollten Sie alle Referenzen zu "rpc.mountd" in den Dateien
  /etc/hosts.allow und /etc/hosts.deny mit "mountd" ersetzen.
  .
  Deshalb sollten Sie alle Referenzen zu "rpc.mountd" in den Dateien
  /etc/hosts.allow und /etc/hosts.deny mit "mountd" ersetzen.

+Description-ru: úÁÍÅÎÉÔÅ × /etc/hosts.{allow,deny} "rpc.mountd" ÎÁ "mountd"
+ äÅÍÏÎ  ÍÏÎÔÉÒÏ×ÁÎÉÑ  ÉÓÐÏÌØÚÕÅÔ  ÄÌÑ ÕÐÒÁ×ÌÅÎÉÑ ÄÏÓÔÕÐÏÍ tcp-×ÒÁÐÐÅÒÙ.
+ þÔÏÂÙ  ÉÈ  ÎÁÓÔÒÏÉÔØ,  ÉÓÐÏÌØÚÕÊÔÅ  ÉÍÑ  "mountd"  × /etc/hosts.allow É
+ /etc/hosts.deny.
+ .
+ âÏÌÅÅ  ÓÔÁÒÙÅ  ×ÅÒÓÉÉ  nfs-kernel-server  ×ËÌÀÞÁÌÉ ÄÅÍÏÎ ÍÏÎÔÉÒÏ×ÁÎÉÑ,
+ ËÏÔÏÒÙÊ  ÎÁÚÙ×ÁÌ  ÓÅÂÑ  "rpc.mountd".  ðÏÜÔÏÍÕ, ×Ù ÄÏÌÖÎÙ ÚÁÍÅÎÉÔØ ×ÓÅ
+ ×ÈÏÖÄÅÎÉÑ   "rpc.mountd"  ÎÁ  "mountd"  ×  ÆÁÊÌÁÈ  /etc/hosts.allow  É
+ /etc/hosts.deny.

diff --git a/utils/nfsd/nfsd.man b/utils/nfsd/nfsd.man
index f415cfd65af6e4154c62db7feb603e84cbd9ace1..a890ea6df12c8f8d8e830dcdc73b2d7df64f6370 100644 (file)
--- a/utils/nfsd/nfsd.man
+++ b/utils/nfsd/nfsd.man
@@ -18,7 +18,7 @@ number of kernel threads.
 .P
 The
 .B rpc.mountd
 .P
 The
 .B rpc.mountd

-server provides an ancially service needed to satisfy mount requests
+server provides an ancillary service needed to satisfy mount requests

 by NFS clients.
 .SH OPTIONS
 .TP
 by NFS clients.
 .SH OPTIONS
 .TP