Take the default tape device value and the path for fstab from system headers files.

diff --git a/CHANGES b/CHANGES
index 74e424332cb34a59baf3e9277cd6c36987df48ba..49a14da3aecab78c9254eb936ceac0048015c133 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.85 2000/11/03 18:28:58 stelian Exp $
+$Id: CHANGES,v 1.86 2000/11/10 09:35:07 stelian Exp $
 
 Changes between versions 0.4b19 and 0.4b20 (released ???????????????)
 =====================================================================
@@ -37,6 +37,10 @@ Changes between versions 0.4b19 and 0.4b20 (released ???????????????)
 7.     Restore the real uid and gid before invoking an external
        RSH program (big hole when dump or restore is suid root!).
 
+8.     Get the values for the default tape device and the location
+       of fstab file from the system headers. Thanks to
+       Andreas Dilger <adilger@turbolinux.com> for the patch.
+
 Changes between versions 0.4b18 and 0.4b19 (released August 20, 2000)
 =====================================================================
 

diff --git a/THANKS b/THANKS
index fc1b053f60b4e332e70bdfaf940b0f0b51b03a38..1653c13a3295197159ff976ed66f04997b81de64 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.37 2000/09/01 14:26:23 stelian Exp $
+$Id: THANKS,v 1.38 2000/11/10 09:35:07 stelian Exp $
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
@@ -30,7 +30,7 @@ Rainer Clasen         bj@ncc.cicely.de
 W. Reilly Cooley       wcooley@nakedape.cc
 Abhijit Dasgupta       abhijit@ans.net
 John R. Dennison       gerdesas@users.sourceforge.net
-Andreas Dilger         adilger@home.com
+Andreas Dilger         adilger@turbolinux.com
 Bernhard Erdmann       bernhard.erdmann@gmx.de
 Jason Fearon           jasonf@netrider.org.au
 Jeremy Fitzhardinge    jeremy@goop.org

diff --git a/compat/include/fstab.h b/compat/include/fstab.h
index e29cf03bc5e313f20069b506a924d02d369fd21c..bb5a735924cea34123bc903a678c3d24118528eb 100644 (file)
--- a/compat/include/fstab.h
+++ b/compat/include/fstab.h
@@ -4,7 +4,7 @@
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 1999-2000
  *
- *     $Id: fstab.h,v 1.5 2000/01/21 10:17:41 stelian Exp $
+ *     $Id: fstab.h,v 1.6 2000/11/10 09:35:07 stelian Exp $
  */
 
 /*
@@ -54,8 +54,14 @@
  * if type is "rq", then use concatenation of fs_file and "quotas" to locate
  * quota file.
  */
+#ifdef __linux__
+#include <mntent.h>
+#define _PATH_FSTAB    _PATH_MNTTAB
+#endif
+#ifndef _PATH_FSTAB
 #define        _PATH_FSTAB     "/etc/fstab"
-#define        FSTAB           "/etc/fstab"    /* deprecated */
+#endif
+#define        FSTAB           _PATH_FSTAB     /* deprecated */
 
 #define FSTAB_DEF      "defaults"      /* default mount option */
 #define        FSTAB_RW        "rw"            /* read/write device */

diff --git a/compat/include/pathnames.h b/compat/include/pathnames.h
index 29bbd681a14916473308e854c4e7b221ff52cdf7..34218c8c89ecabdd5f9d3c2c99a83120670a444d 100644 (file)
--- a/compat/include/pathnames.h
+++ b/compat/include/pathnames.h
@@ -4,7 +4,7 @@
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 1999-2000
  *
- *     $Id: pathnames.h,v 1.7 2000/02/26 01:35:48 stelian Exp $
+ *     $Id: pathnames.h,v 1.8 2000/11/10 09:35:07 stelian Exp $
  */
 
 /*
@@ -42,5 +42,13 @@
 
 #include <paths.h>
 
+#ifdef __linux__
+#include <sys/mtio.h>  /* use the same default tape as "mt" */
+#define _PATH_DEFTAPE  DEFTAPE
+#endif
+
+#ifndef _PATH_DEFTAPE
 #define        _PATH_DEFTAPE   "/dev/st0"
+#endif
+
 #define        _PATH_RMT       "/etc/rmt"              /* path on remote host */