diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index c50545e1ad0288764a96194f620ddcaf4509e89a..f6b127429f4604b997e8404e88d743af07d29281 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
CHANGELOG for smartmontools
-$Id: CHANGELOG,v 1.76 2003/01/03 07:00:26 ballen4705 Exp $
+$Id: CHANGELOG,v 1.77 2003/01/03 12:23:40 pjwilliams Exp $
Copyright (C) 2002 Bruce Allen <smartmontools-support@lists.sourceforge.net>
@@ -38,6 +38,8 @@ CURRENT RELEASE (see VERSION file in this directory):
smartmontools-5.1.1
+ [PW] Renamed smartd option -X to -d
+
START OF SMARTMONTOOLS 5.1 series
smartmontools-5.0.50
diff --git a/sm5/README b/sm5/README
index c791f793d7409f536066e4ebdcd4ce1d28b1567a..3efb37959715f88fc3492a18be9026424ba95178 100644
--- a/sm5/README
+++ b/sm5/README
@@ -234,7 +234,7 @@ old to new smartd.conf directives:
\ Line continuation \
-------------------------------------------------------------------------------------------------------------------
-Changes to smartd options (in progress):
+Changes to smartd options:
----------------------------------------------------------------------------------------------------------
5.0 short 5.0 long 5.1 short 5.1 long
diff --git a/sm5/smartd.8 b/sm5/smartd.8
index 67b6909a217dd9adee4f9cb15a49cfafd51040ba..dfe7d1a068838122e7e8063934dd909c0123e824 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.45 2003/01/03 06:38:58 ballen4705 Exp $
+\# $Id: smartd.8,v 1.46 2003/01/03 12:23:40 pjwilliams 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: 2003/01/03 06:38:58 $" "smartmontools-5.0"
+.TH SMARTD 8 "$Date: 2003/01/03 12:23:40 $" "smartmontools-5.0"
.SH NAME
smartd \- S.M.A.R.T. Daemon
.SH SYNOPSIS
@@ -97,8 +97,8 @@ Long options are not supported on all systems. Use
.B 'smartd \-h'
to see the available options.
.TP
-.B \-X, \-\-debug
-eXamine: Runs
+.B \-d, \-\-debug
+Runs
.B smartd
in "debug" mode. In this mode, it does not
.B fork
@@ -666,4 +666,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.45 2003/01/03 06:38:58 ballen4705 Exp $
+$Id: smartd.8,v 1.46 2003/01/03 12:23:40 pjwilliams Exp $
diff --git a/sm5/smartd.c b/sm5/smartd.c
index 686a0d5e9c747fe8aaa82ed97c371beb995632bd..f22f38e7a6756e9b5f53cce0c22abed3516c1b5f 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -50,7 +50,7 @@
// CVS ID strings
extern const char *CVSid1, *CVSid2;
-const char *CVSid6="$Id: smartd.c,v 1.90 2003/01/01 23:27:31 pjwilliams Exp $"
+const char *CVSid6="$Id: smartd.c,v 1.91 2003/01/03 12:23:41 pjwilliams Exp $"
CVSID1 CVSID2 CVSID3 CVSID4 CVSID7;
// global variable used for control of printing, passing arguments, etc.
@@ -344,7 +344,7 @@ void Usage (void){
printout(LOG_INFO,"Usage: smartd [options]\n\n");
#ifdef HAVE_GETOPT_LONG
printout(LOG_INFO,"Command Line Options:\n");
- printout(LOG_INFO," -X, --debug\n Start smartd in debug mode\n\n");
+ printout(LOG_INFO," -d, --debug\n Start smartd in debug mode\n\n");
printout(LOG_INFO," -i N, --interval=N\n");
printout(LOG_INFO," Set interval between disk checks to N seconds, where N >= 10\n\n");
printout(LOG_INFO," -V, --version, --license, --copyright\n");
@@ -352,7 +352,7 @@ void Usage (void){
printout(LOG_INFO," -h, -?, --help, --usage\n Display this help and exit\n\n");
#else
printout(LOG_INFO,"Command Line Options:\n");
- printout(LOG_INFO," -X Start smartd in debug mode\n");
+ printout(LOG_INFO," -d Start smartd in debug mode\n");
printout(LOG_INFO," -i N Set interval between disk checks to N seconds, where N >= 10\n");
printout(LOG_INFO," -V Print License, Copyright, and version information\n");
printout(LOG_INFO," -h Display this help and exit\n");
@@ -1411,11 +1411,11 @@ void ParseOpts(int argc, char **argv){
int optchar;
char *tailptr;
long lchecktime;
- const char *shortopts = "Xi:Vh?";
+ const char *shortopts = "di:Vh?";
#ifdef HAVE_GETOPT_LONG
char *arg;
struct option longopts[] = {
- { "debug", no_argument, 0, 'X' },
+ { "debug", no_argument, 0, 'd' },
{ "interval", required_argument, 0, 'i' },
{ "version", no_argument, 0, 'V' },
{ "license", no_argument, 0, 'V' },
@@ -1435,7 +1435,7 @@ void ParseOpts(int argc, char **argv){
while (-1 != (optchar = getopt(argc, argv, shortopts))){
#endif
switch(optchar) {
- case 'X':
+ case 'd':
debugmode = TRUE;
break;
case 'i':
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index cebfffe255edb3024362e1847d3b4f97a4c0123e..bdb9a9f9f08056cfa5a6de82fac1ba69efb4a1de 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -50,7 +50,7 @@
// CVS ID strings
extern const char *CVSid1, *CVSid2;
-const char *CVSid6="$Id: smartd.cpp,v 1.90 2003/01/01 23:27:31 pjwilliams Exp $"
+const char *CVSid6="$Id: smartd.cpp,v 1.91 2003/01/03 12:23:41 pjwilliams Exp $"
CVSID1 CVSID2 CVSID3 CVSID4 CVSID7;
// global variable used for control of printing, passing arguments, etc.
@@ -344,7 +344,7 @@ void Usage (void){
printout(LOG_INFO,"Usage: smartd [options]\n\n");
#ifdef HAVE_GETOPT_LONG
printout(LOG_INFO,"Command Line Options:\n");
- printout(LOG_INFO," -X, --debug\n Start smartd in debug mode\n\n");
+ printout(LOG_INFO," -d, --debug\n Start smartd in debug mode\n\n");
printout(LOG_INFO," -i N, --interval=N\n");
printout(LOG_INFO," Set interval between disk checks to N seconds, where N >= 10\n\n");
printout(LOG_INFO," -V, --version, --license, --copyright\n");
@@ -352,7 +352,7 @@ void Usage (void){
printout(LOG_INFO," -h, -?, --help, --usage\n Display this help and exit\n\n");
#else
printout(LOG_INFO,"Command Line Options:\n");
- printout(LOG_INFO," -X Start smartd in debug mode\n");
+ printout(LOG_INFO," -d Start smartd in debug mode\n");
printout(LOG_INFO," -i N Set interval between disk checks to N seconds, where N >= 10\n");
printout(LOG_INFO," -V Print License, Copyright, and version information\n");
printout(LOG_INFO," -h Display this help and exit\n");
@@ -1411,11 +1411,11 @@ void ParseOpts(int argc, char **argv){
int optchar;
char *tailptr;
long lchecktime;
- const char *shortopts = "Xi:Vh?";
+ const char *shortopts = "di:Vh?";
#ifdef HAVE_GETOPT_LONG
char *arg;
struct option longopts[] = {
- { "debug", no_argument, 0, 'X' },
+ { "debug", no_argument, 0, 'd' },
{ "interval", required_argument, 0, 'i' },
{ "version", no_argument, 0, 'V' },
{ "license", no_argument, 0, 'V' },
@@ -1435,7 +1435,7 @@ void ParseOpts(int argc, char **argv){
while (-1 != (optchar = getopt(argc, argv, shortopts))){
#endif
switch(optchar) {
- case 'X':
+ case 'd':
debugmode = TRUE;
break;
case 'i':