From d6b43ea99a997ed010c1b5c88846dca34262bf4e Mon Sep 17 00:00:00 2001 From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Thu, 7 Nov 2002 21:51:34 +0000 Subject: [PATCH] release 32 git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@224 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- sm5/CHANGELOG | 4 +++- sm5/Makefile | 37 ++++++++++++++++++++----------------- sm5/README | 1 + sm5/TODO | 5 ++++- sm5/smartctl.8 | 7 ++++--- sm5/smartd.8 | 15 +++++++++++---- sm5/smartmontools.spec | 6 ++++-- 7 files changed, 47 insertions(+), 28 deletions(-) diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG index aa21a4120..bba73c91a 100644 --- a/sm5/CHANGELOG +++ b/sm5/CHANGELOG @@ -1,6 +1,6 @@ CHANGELOG for smartmontools -$Id: CHANGELOG,v 1.39 2002/11/07 19:07:20 ballen4705 Exp $ +$Id: CHANGELOG,v 1.40 2002/11/07 21:51:34 ballen4705 Exp $ Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> @@ -25,6 +25,8 @@ NOTES FOR FUTURE RELEASES: see TODO file. CURRENT RELEASE (see VERSION file in this directory): + Added manual page smartd.conf.5 for configuration file. + smartctl: Missing ANSI prototype in failuretest(); fixed. smartctl: Checksum warnings now printed on stdout, or are silent, diff --git a/sm5/Makefile b/sm5/Makefile index ce8502336..adafd48c1 100644 --- a/sm5/Makefile +++ b/sm5/Makefile @@ -2,7 +2,7 @@ # # Home page: http://smartmontools.sourceforge.net # -# $Id: Makefile,v 1.35 2002/11/07 19:07:20 ballen4705 Exp $ +# $Id: Makefile,v 1.36 2002/11/07 21:51:34 ballen4705 Exp $ # # Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> # @@ -39,7 +39,7 @@ LDFLAGS = # -s releasefiles=atacmds.c atacmds.h ataprint.c ataprint.h CHANGELOG COPYING extern.h Makefile\ README scsicmds.c scsicmds.h scsiprint.c scsiprint.h smartctl.8 smartctl.c smartctl.h\ - smartd.8 smartd.c smartd.h smartd.initd TODO VERSION smartd.conf + smartd.8 smartd.c smartd.h smartd.initd TODO VERSION smartd.conf smartd.conf.5 counter=$(shell cat VERSION) newcounter=$(shell ./add ) @@ -73,26 +73,28 @@ scsiprint.o: scsiprint.c extern.h scsicmds.h scsiprint.h smartctl.h Makefile $(CC) $(CFLAGS) -c scsiprint.c clean: - rm -f *.o smartctl smartd *~ \#*\# smartmontools*.tar.gz smartmontools*.rpm temp.* smart*.8.gz + rm -f *.o smartctl smartd *~ \#*\# smartmontools*.tar.gz smartmontools*.rpm temp.* smart*.8.gz smart*.5.gz install: if [ ! -f smartd -o ! -f smartctl ] ; then echo -e "\n\nYOU MUST FIRST DO \"make\"\n" ; exit 1 ; fi /bin/gzip -c smartctl.8 > smartctl.8.gz /bin/gzip -c smartd.8 > smartd.8.gz + /bin/gzip -c smartd.conf.5 > smartd.conf.5.gz rm -f $(DESTDIR)/usr/share/man/man8/smartctl.8 rm -f $(DESTDIR)/usr/share/man/man8/smartd.8 - install -m 755 -o root -g root -D smartctl $(DESTDIR)/usr/sbin/smartctl - install -m 755 -o root -g root -D smartd $(DESTDIR)/usr/sbin/smartd - install -m 755 -o root -g root -D smartd.initd $(DESTDIR)/etc/rc.d/init.d/smartd - install -m 644 -o root -g root -D smartctl.8.gz $(DESTDIR)/usr/share/man/man8/smartctl.8.gz - install -m 644 -o root -g root -D smartd.8.gz $(DESTDIR)/usr/share/man/man8/smartd.8.gz - install -m 644 -o root -g root -D CHANGELOG $(DESTDIR)/usr/share/doc/smartmontools-5.0/CHANGELOG - install -m 644 -o root -g root -D COPYING $(DESTDIR)/usr/share/doc/smartmontools-5.0/COPYING - install -m 644 -o root -g root -D README $(DESTDIR)/usr/share/doc/smartmontools-5.0/README - install -m 644 -o root -g root -D TODO $(DESTDIR)/usr/share/doc/smartmontools-5.0/TODO - install -m 644 -o root -g root -D VERSION $(DESTDIR)/usr/share/doc/smartmontools-5.0/VERSION - install -m 644 -o root -g root -D smartd.conf $(DESTDIR)/usr/share/doc/smartmontools-5.0/smartd.conf - install -m 644 -o root -g root -D smartd.conf $(DESTDIR)/etc/smartd.conf.example + install -m 755 -o root -g root -D smartctl $(DESTDIR)/usr/sbin/smartctl + install -m 755 -o root -g root -D smartd $(DESTDIR)/usr/sbin/smartd + install -m 755 -o root -g root -D smartd.initd $(DESTDIR)/etc/rc.d/init.d/smartd + install -m 644 -o root -g root -D smartctl.8.gz $(DESTDIR)/usr/share/man/man8/smartctl.8.gz + install -m 644 -o root -g root -D smartd.8.gz $(DESTDIR)/usr/share/man/man8/smartd.8.gz + install -m 644 -o root -g root -D smartd.conf.5.gz $(DESTDIR)/usr/share/man/man5/smartd.conf.5.gz + install -m 644 -o root -g root -D CHANGELOG $(DESTDIR)/usr/share/doc/smartmontools-5.0/CHANGELOG + install -m 644 -o root -g root -D COPYING $(DESTDIR)/usr/share/doc/smartmontools-5.0/COPYING + install -m 644 -o root -g root -D README $(DESTDIR)/usr/share/doc/smartmontools-5.0/README + install -m 644 -o root -g root -D TODO $(DESTDIR)/usr/share/doc/smartmontools-5.0/TODO + install -m 644 -o root -g root -D VERSION $(DESTDIR)/usr/share/doc/smartmontools-5.0/VERSION + install -m 644 -o root -g root -D smartd.conf $(DESTDIR)/usr/share/doc/smartmontools-5.0/smartd.conf + install -m 644 -o root -g root -D smartd.conf $(DESTDIR)/etc/smartd.conf.example if [ ! -f $(DESTDIR)/etc/smartd.conf ] ; then install -m 644 -o root -g root -D smartd.conf $(DESTDIR)/etc/smartd.conf ; fi @echo -e "\n\nTo manually start smartd on bootup, run /etc/rc.d/init.d/smartd start" @echo "To automatically start smartd on bootup, run /sbin/chkconfig --add smartd" @@ -102,8 +104,9 @@ install: # 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 \ - /usr/share/man/man8/smartctl.8.gz /usr/share/man/man8/smartd.8.gz /usr/sbin/smartd + rm -f /usr/share/man/man8/smartctl.8 /usr/share/man/man8/smartd.8 /usr/sbin/smartctl \ + /usr/share/man/man8/smartctl.8.gz /usr/share/man/man8/smartd.8.gz \ + /usr/share/man/man5/smartd.conf.5.gz /usr/sbin/smartd rm -rf /usr/share/doc/smartmontools-5.0/ if [ -f /var/lock/subsys/smartd -a -f /etc/rc.d/init.d/smartd ] ; then /etc/rc.d/init.d/smartd stop ; fi if [ -f /etc/rc.d/init.d/smartd ] ; then /sbin/chkconfig --del smartd ; fi diff --git a/sm5/README b/sm5/README index 405f8202c..d14bae23f 100644 --- a/sm5/README +++ b/sm5/README @@ -85,6 +85,7 @@ Eleven files are installed: /etc/rc.d/init.d/smartd [Init/Startup script for smartd] /usr/share/man/man8/smartctl.8.gz [Manual page] /usr/share/man/man8/smartd.8.gz [Manual page] +/usr/share/man/man8/smartd.conf.5.gz [Manual page] /usr/share/doc/smartmontools-5.0/README [What you are reading!] /usr/share/doc/smartmontools-5.0/TODO [Things that need to be done/fixed] /usr/share/doc/smartmontools-5.0/CHANGELOG [A log of changes. Also see CVS] diff --git a/sm5/TODO b/sm5/TODO index 0ad17549a..18b73f8de 100644 --- a/sm5/TODO +++ b/sm5/TODO @@ -4,7 +4,7 @@ Home page of code is: http://smartmontools.sourceforge.net Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> -$Id: TODO,v 1.20 2002/11/07 11:00:55 ballen4705 Exp $ +$Id: TODO,v 1.21 2002/11/07 21:51:34 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 @@ -66,6 +66,9 @@ Use daemon (8) function instead of do-it-yourself daemon_init(). But, does it close all open file descriptors? Must read glibc code to see: documentation unclear. +Automatically generate smartd.conf.5 man page by extraction of source +from smartd.8 man page, or simply split them up. + General Fixes ------------- diff --git a/sm5/smartctl.8 b/sm5/smartctl.8 index 335eb39b2..56550862a 100644 --- a/sm5/smartctl.8 +++ b/sm5/smartctl.8 @@ -1,6 +1,6 @@ \# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> \# -\# $Id: smartctl.8,v 1.24 2002/11/07 11:00:56 ballen4705 Exp $ +\# $Id: smartctl.8,v 1.25 2002/11/07 21:51:34 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 @@ -15,7 +15,8 @@ \# at the Concurrent Systems Laboratory (now part of the Storage Systems \# Research Center), Jack Baskin School of Engineering, University of \# California, Santa Cruz. http://ssrc.soe.ucsc.edu/ -.TH SMARTCTL 8 "$Date: 2002/11/07 11:00:56 $" "smartmontools-5.0" +\# +.TH SMARTCTL 8 "$Date: 2002/11/07 21:51:34 $" "smartmontools-5.0" .SH NAME smartctl \- S.M.A.R.T. control and monitor utility .SH SYNOPSIS @@ -527,4 +528,4 @@ Please let us know if there is an on\-line source for this document. .SH CVS ID OF THIS PAGE: -$Id: smartctl.8,v 1.24 2002/11/07 11:00:56 ballen4705 Exp $ +$Id: smartctl.8,v 1.25 2002/11/07 21:51:34 ballen4705 Exp $ diff --git a/sm5/smartd.8 b/sm5/smartd.8 index 6f744b303..b726e6405 100644 --- a/sm5/smartd.8 +++ b/sm5/smartd.8 @@ -1,5 +1,7 @@ \# Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> \# +\# $Id: smartd.8,v 1.23 2002/11/07 21:51:34 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 \# Software Foundation; either version 2, or (at your option) any later @@ -13,7 +15,8 @@ \# at the Concurrent Systems Laboratory (now part of the Storage Systems \# Research Center), Jack Baskin School of Engineering, University of \# California, Santa Cruz. http://ssrc.soe.ucsc.edu/ -.TH SMARTD 8 "$Date: 2002/10/31 17:35:31 $" "smartmontools-5.0" +\# +.TH SMARTD 8 "$Date: 2002/11/07 21:51:34 $" "smartmontools-5.0" .SH NAME smartd \- S.M.A.R.T. Daemon .SH SYNOPSIS @@ -162,9 +165,11 @@ by using the configuration file This file contains a list of devices to monitor, with one device per line. An example file is included with the .B smartmontools -distribution, but is not normally installed in /etc. If +distribution, and is normally placed in +.B /etc/smartd.conf.example. +If .B smartmontools -was properly installed on your system, you will find this sample +was properly installed on your system, you will also find this sample configuration file in .B /usr/share/doc/smartmontools-5.0/. For security, the configuration file should not be writable by anyone @@ -447,6 +452,8 @@ http://smartmontools.sourceforge.net/ .SH SEE ALSO: +.B smartd.conf +(5), .B smartctl (8), .B syslogd @@ -496,4 +503,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.22 2002/10/31 17:35:31 ballen4705 Exp $ +$Id: smartd.8,v 1.23 2002/11/07 21:51:34 ballen4705 Exp $ diff --git a/sm5/smartmontools.spec b/sm5/smartmontools.spec index 7730323cd..6664b0330 100644 --- a/sm5/smartmontools.spec +++ b/sm5/smartmontools.spec @@ -1,4 +1,4 @@ -Release: 31 +Release: 32 Summary: SMARTmontools - for monitoring S.M.A.R.T. disks and devices Summary(de.iso-8859-1): SMARTmontools - zur �berwachung von S.M.A.R.T.-Platten und-Ger�ten Summary(es.iso-8859-1): SMARTmontools - para el seguimiento de discos y dispositivos S.M.A.R.T. @@ -27,7 +27,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.48 2002/11/07 11:28:17 ballen4705 Exp $ +# $Id: smartmontools.spec,v 1.49 2002/11/07 21:51:34 ballen4705 Exp $ # Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> # Home page: http://smartmontools.sourceforge.net/ @@ -173,6 +173,7 @@ make DESTDIR=$RPM_BUILD_ROOT install %attr(755,root,root) /etc/rc.d/init.d/smartd %attr(644,root,root) %{_mandir}/man8/smartctl.8* %attr(644,root,root) %{_mandir}/man8/smartd.8* +%attr(644,root,root) %{_mandir}/man5/smartd.conf.5* %doc CHANGELOG COPYING TODO README VERSION smartd.conf %config(noreplace) %{_sysconfdir}/smartd.conf %config %{_sysconfdir}/smartd.conf.example @@ -214,6 +215,7 @@ fi %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * Thu Nov 7 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net> +- Added a Man section 5 page for smartd.conf - Changed Makefile so that the -V option does not reflect file state before commit! - modified .spec file so that locale information now contains -- GitLab