Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=62d635a4…
Commit: 62d635a45478c0888a64983243cc0770c782aac3
Parent: 77ac33cc6d637f43a71c614a7488fd4c901a0487
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Thu Nov 13 16:49:19 2014 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Thu Nov 13 16:49:19 2014 +0100
fence_scsi: Short getopt for logfile differs in help/getopt
According to help text, user should use -a for setting logfile but
this option means 'APTL flag", this patch fixes it to -f as was accepted
also before.
---
fence/agents/scsi/fence_scsi.py | 2 +-
tests/data/metadata/fence_scsi.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/agents/scsi/fence_scsi.py b/fence/agents/scsi/fence_scsi.py
index ae960cc..72f9d90 100644
--- a/fence/agents/scsi/fence_scsi.py
+++ b/fence/agents/scsi/fence_scsi.py
@@ -292,7 +292,7 @@ be removed from the device(s).",
all_opt["logfile"] = {
"getopt" : "f:",
"longopt" : "logfile",
- "help" : "-a, --logfile Log output (stdout and stderr) to file",
+ "help" : "-f, --logfile Log output (stdout and stderr) to file",
"required" : "0",
"shortdesc" : "Log output (stdout and stderr) to file",
"order": 5
diff --git a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
index 590f4aa..738dd00 100644
--- a/tests/data/metadata/fence_scsi.xml
+++ b/tests/data/metadata/fence_scsi.xml
@@ -30,7 +30,7 @@ The fence_scsi agent works by having each node in the cluster register a unique
<shortdesc lang="en">Name of the node to be fenced. The node name is used to generate the key value used for the current operation. This option will be ignored when used with the -k option.</shortdesc>
</parameter>
<parameter name="logfile" unique="0" required="0">
- <getopt mixed="-a, --logfile" />
+ <getopt mixed="-f, --logfile" />
<content type="string" />
<shortdesc lang="en">Log output (stdout and stderr) to file</shortdesc>
</parameter>
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=a3647dea1d…
Commit: a3647dea1dedb9b4ecf9d7b6de24d990d7f7d915
Parent: 05cec12283b7652144a57460166a8147cf3e5144
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Sat Nov 1 14:20:22 2014 +0000
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Sat Nov 1 14:20:22 2014 +0000
gfs2-utils configure: Use AC_HELP_STRING in help messages
This makes it easier to keep text alignment in ./configure --help. Also
re-word an error message.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
configure.ac | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index e70409c..2341730 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ esac
# check stolen from gnulib/m4/gnu-make.m4
if ! ${MAKE-make} --version /cannot/make/this >/dev/null 2>&1; then
- AC_MSG_ERROR([you don't seem to have GNU make; it is required])
+ AC_MSG_ERROR([GNU make was not found but is required.])
fi
AC_PROG_CC
@@ -87,11 +87,11 @@ check_lib_no_libs() {
# local options
AC_ARG_ENABLE([debug],
- [ --enable-debug enable debug build. ],
- [ default="no" ])
+ AC_HELP_STRING([--enable-debug],[enable debug build [default=no]]),
+ [default="no"])
AC_ARG_ENABLE([gcov],
- [ --enable-gcov enable coverage instrumentation.],
- [ default="no" ])
+ AC_HELP_STRING([--enable-gcov],[enable coverage instrumentation [default=no]]),
+ [default="no"])
# We use the Check framework for unit tests
PKG_CHECK_MODULES([check], [check >= 0.9.8],
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=05cec12283…
Commit: 05cec12283b7652144a57460166a8147cf3e5144
Parent: 1be9a5c934cb239e3374d093c3ff0ad9857945aa
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Sat Nov 1 13:48:53 2014 +0000
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Sat Nov 1 13:53:36 2014 +0000
gfs2-utils: Honour --sbindir
If the user specifies --sbindir=foo then we should honour it.
fsck/Makefile.am and scripts/Makefile.am were the only remaining
directories with this shell snippet.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/fsck/Makefile.am | 8 --------
gfs2/scripts/Makefile.am | 9 ---------
2 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am
index 92d56f3..b34833b 100644
--- a/gfs2/fsck/Makefile.am
+++ b/gfs2/fsck/Makefile.am
@@ -1,13 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-# When an exec_prefix setting would have us install into /usr/sbin,
-# use /sbin instead.
-# Accept an existing sbindir value of /usr/sbin (probably for older automake),
-# or an empty value, for automake-1.11 and newer.
-sbindir := $(shell rpl=0; test '$(exec_prefix):$(sbindir)' = /usr:/usr/sbin \
- || test '$(exec_prefix):$(sbindir)' = /usr: && rpl=1; \
- test $$rpl = 1 && echo /sbin || echo '$(exec_prefix)/sbin')
-
sbin_PROGRAMS = fsck.gfs2
noinst_HEADERS = fsck.h fs_recovery.h \
diff --git a/gfs2/scripts/Makefile.am b/gfs2/scripts/Makefile.am
index 2c51222..1c98f95 100644
--- a/gfs2/scripts/Makefile.am
+++ b/gfs2/scripts/Makefile.am
@@ -1,12 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
-# When an exec_prefix setting would have us install into /usr/sbin,
-# use /sbin instead.
-# Accept an existing sbindir value of /usr/sbin (probably for older automake),
-# or an empty value, for automake-1.11 and newer.
-sbindir := $(shell rpl=0; test '$(exec_prefix):$(sbindir)' = /usr:/usr/sbin \
- || test '$(exec_prefix):$(sbindir)' = /usr: && rpl=1; \
- test $$rpl = 1 && echo /sbin || echo '$(exec_prefix)/sbin')
-
-
dist_sbin_SCRIPTS = gfs2_lockcapture gfs2_trace