From 6169d8400ef19c54b1a5ccc0fec865ade5344f7d Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Fri, 10 Nov 2000 09:35:07 +0000 Subject: [PATCH] Take the default tape device value and the path for fstab from system headers files. --- CHANGES | 6 +++++- THANKS | 4 ++-- compat/include/fstab.h | 10 ++++++++-- compat/include/pathnames.h | 10 +++++++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 74e4243..49a14da 100644 --- 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 for the patch. + Changes between versions 0.4b18 and 0.4b19 (released August 20, 2000) ===================================================================== diff --git a/THANKS b/THANKS index fc1b053..1653c13 100644 --- 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 e29cf03..bb5a735 100644 --- a/compat/include/fstab.h +++ b/compat/include/fstab.h @@ -4,7 +4,7 @@ * Remy Card , 1994-1997 * Stelian Pop , 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 +#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 29bbd68..34218c8 100644 --- a/compat/include/pathnames.h +++ b/compat/include/pathnames.h @@ -4,7 +4,7 @@ * Remy Card , 1994-1997 * Stelian Pop , 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 +#ifdef __linux__ +#include /* 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 */ -- 2.39.2