diff --git a/sm5/Makefile b/sm5/Makefile
index adafd48c161ebc75a5b9ee12901d6d2c81795897..7e215fc8f51b1f05ed6bfd84c6506349795ab58b 100644
--- a/sm5/Makefile
+++ b/sm5/Makefile
@@ -2,7 +2,7 @@
#
# Home page: http://smartmontools.sourceforge.net
#
-# $Id: Makefile,v 1.36 2002/11/07 21:51:34 ballen4705 Exp $
+# $Id: Makefile,v 1.37 2002/11/11 12:43:53 ballen4705 Exp $
#
# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
#
@@ -72,6 +72,18 @@ scsicmds.o: scsicmds.c scsicmds.h Makefile
scsiprint.o: scsiprint.c extern.h scsicmds.h scsiprint.h smartctl.h Makefile
$(CC) $(CFLAGS) -c scsiprint.c
+# This extracts the configuration file directives from smartd.8 and
+# inserts them into smartd.conf.5
+smartd.conf.5: smartd.8
+ sed '1,/STARTINCLUDE/ D;/ENDINCLUDE/,$$D' < smartd.8 > tmp.directives
+ sed '/STARTINCLUDE/,$$D' < smartd.conf.5 > tmp.head
+ sed '1,/ENDINCLUDE/D' < smartd.conf.5 > tmp.tail
+ cat tmp.head > smartd.conf.5
+ echo "\# STARTINCLUDE" >> smartd.conf.5
+ cat tmp.directives >> smartd.conf.5
+ echo "\# ENDINCLUDE" >> smartd.conf.5
+ cat tmp.tail >> smartd.conf.5
+ rm -f tmp.head tmp.tail tmp.directives
clean:
rm -f *.o smartctl smartd *~ \#*\# smartmontools*.tar.gz smartmontools*.rpm temp.* smart*.8.gz smart*.5.gz
@@ -101,7 +113,6 @@ install:
@echo -e "\n\nSmartd can now use a configuration file /etc/smartd.conf. Do:\nman 8 smartd\n."
@echo -e "A sample configuration file may be found in /usr/share/doc/smartmontools-5.0 and /etc/smartd.conf.example/\n\n"
-
# perhaps for consistency I should also have $(DESTDIR) for the uninstall...
uninstall:
rm -f /usr/share/man/man8/smartctl.8 /usr/share/man/man8/smartd.8 /usr/sbin/smartctl \
@@ -117,7 +128,7 @@ uninstall:
# All this mess is to automatically increment the release numbers.
# The number of the next release is kept in the file "VERSION"
-release:
+release: smartd.conf.5
cat smartmontools.spec | sed '/Release:/d' > temp.spec
echo "Release: " $(counter) > temp.version
cat temp.version temp.spec > smartmontools.spec
diff --git a/sm5/VERSION b/sm5/VERSION
index 81b5c5d06cc0b8290c264b408abb32cc0986e8f2..e522732c77ec94723e739d22f28df549b0231f5f 100644
--- a/sm5/VERSION
+++ b/sm5/VERSION
@@ -1 +1 @@
-37
+38
diff --git a/sm5/smartd.8 b/sm5/smartd.8
index bde0b11f62950d588a7753cb0e45115aeca4f7ec..11cc7b7ecc03cc190faf6b6bff3345c214f2a34f 100644
--- a/sm5/smartd.8
+++ b/sm5/smartd.8
@@ -1,6 +1,6 @@
\# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
\#
-\# $Id: smartd.8,v 1.24 2002/11/10 21:54:19 ballen4705 Exp $
+\# $Id: smartd.8,v 1.25 2002/11/11 12:43:53 ballen4705 Exp $
\#
\# This program is free software; you can redistribute it and/or modify it
\# under the terms of the GNU General Public License as published by the Free
@@ -16,7 +16,7 @@
\# Research Center), Jack Baskin School of Engineering, University of
\# California, Santa Cruz. http://ssrc.soe.ucsc.edu/
\#
-.TH SMARTD 8 "$Date: 2002/11/10 21:54:19 $" "smartmontools-5.0"
+.TH SMARTD 8 "$Date: 2002/11/11 12:43:53 $" "smartmontools-5.0"
.SH NAME
smartd \- S.M.A.R.T. Daemon
.SH SYNOPSIS
@@ -143,6 +143,8 @@ and disabled using the command:
.nf
.B /sbin/chkconfig --del smartd
+\# STARTINCLUDE
+
.SH CONFIGURATION FILE /etc/smartd.conf
In the absence of a configuration file,
.B smartd
@@ -405,6 +407,8 @@ configuration file Directives might be
If you want more frequent information, use
.B -a.
+\# ENDINCLUDE
+
.SH NOTES
.B smartd
will make log entries at loglevel
@@ -514,4 +518,4 @@ Please let us know if there is an on\-line source for this document.
.SH
CVS ID OF THIS PAGE:
-$Id: smartd.8,v 1.24 2002/11/10 21:54:19 ballen4705 Exp $
+$Id: smartd.8,v 1.25 2002/11/11 12:43:53 ballen4705 Exp $
diff --git a/sm5/smartd.conf.5 b/sm5/smartd.conf.5
index e3500eacd32cb6ae94b7958339fd6df4f4e5f730..82a1182e619278beaf7ae623e8ac92e24f1736ab 100644
--- a/sm5/smartd.conf.5
+++ b/sm5/smartd.conf.5
@@ -1,6 +1,6 @@
\# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
\#
-\# $Id: smartd.conf.5,v 1.2 2002/11/10 21:54:19 ballen4705 Exp $
+\# $Id: smartd.conf.5,v 1.3 2002/11/11 12:43:53 ballen4705 Exp $
\#
\# This program is free software; you can redistribute it and/or modify it
\# under the terms of the GNU General Public License as published by the Free
@@ -16,7 +16,7 @@
\# Research Center), Jack Baskin School of Engineering, University of
\# California, Santa Cruz. http://ssrc.soe.ucsc.edu/
\#
-.TH SMARTD.CONF 5 "$Date: 2002/11/10 21:54:19 $" "smartmontools-5.0"
+.TH SMARTD.CONF 5 "$Date: 2002/11/11 12:43:53 $" "smartmontools-5.0"
.SH NAME
/etc/smartd.conf \- S.M.A.R.T. Monitoring Daemon Configuration File
@@ -40,6 +40,8 @@ that it has
.I not
re-read the configuration file.
+\# STARTINCLUDE
+
.SH CONFIGURATION FILE /etc/smartd.conf
In the absence of a configuration file,
.B smartd
@@ -302,6 +304,8 @@ configuration file Directives might be
If you want more frequent information, use
.B -a.
+\# ENDINCLUDE
+
.PP
.SH AUTHOR
Bruce Allen
@@ -341,4 +345,4 @@ SEE ALSO:
.SH
CVS ID OF THIS PAGE:
-$Id: smartd.conf.5,v 1.2 2002/11/10 21:54:19 ballen4705 Exp $
+$Id: smartd.conf.5,v 1.3 2002/11/11 12:43:53 ballen4705 Exp $
diff --git a/sm5/smartmontools.spec b/sm5/smartmontools.spec
index f741e9006168cbf5a1dd2a81dc7ec11bd21690ed..d5b765231cd0f22cddac5f728653e2b789eb3184 100644
--- a/sm5/smartmontools.spec
+++ b/sm5/smartmontools.spec
@@ -1,4 +1,4 @@
-Release: 37
+Release: 38
Summary: SMARTmontools - for monitoring S.M.A.R.T. disks and devices
Summary(de): SMARTmontools - zur �berwachung von S.M.A.R.T.-Platten und-Ger�ten
Summary(es): SMARTmontools - para el seguimiento de discos y dispositivos S.M.A.R.T.
@@ -29,7 +29,7 @@ Packager: Bruce Allen <smartmontools-support@lists.sourceforge.net>
# http://ftp1.sourceforge.net/smartmontools/smartmontools-%{version}-%{release}.tar.gz
# CVS ID of this file is:
-# $Id: smartmontools.spec,v 1.56 2002/11/11 10:56:35 ballen4705 Exp $
+# $Id: smartmontools.spec,v 1.57 2002/11/11 12:43:53 ballen4705 Exp $
# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
# Home page: http://smartmontools.sourceforge.net/