summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Parent <math.parent@gmail.com>2011-10-15 19:50:12 +0200
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2011-11-08 16:32:03 +1100
commitfa197073cde30ffefb79163c5a0a7b94fb3485bd (patch)
treec36106acfd2c91d51899f55766771d104b2b4461
parent4617a0e9cf6ed7771b20b1221a783cf4837c478a (diff)
downloadsamba-fa197073cde30ffefb79163c5a0a7b94fb3485bd.tar.gz
samba-fa197073cde30ffefb79163c5a0a7b94fb3485bd.tar.xz
samba-fa197073cde30ffefb79163c5a0a7b94fb3485bd.zip
config can be in /etc/default/ instead of /etc/sysconfig/ (ctdb_gnostics part)
(This used to be ctdb commit b6a9dacefd8f031677702f0fbf6b321beb4c4d54)
-rwxr-xr-xctdb/tools/ctdb_diagnostics7
1 files changed, 5 insertions, 2 deletions
diff --git a/ctdb/tools/ctdb_diagnostics b/ctdb/tools/ctdb_diagnostics
index 117def8f6f..e2efb5384e 100755
--- a/ctdb/tools/ctdb_diagnostics
+++ b/ctdb/tools/ctdb_diagnostics
@@ -71,7 +71,11 @@ PATH="$PATH:/sbin:/usr/sbin:/usr/lpp/mmfs/bin"
# list of config files that must exist and that we check are the same
# on the nodes
-CONFIG_FILES_MUST="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/sysconfig/ctdb /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/sysconfig/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
+if [ -d /etc/sysconfig ] ; then
+ CONFIG_FILES_MUST="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/sysconfig/ctdb /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/sysconfig/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
+else
+ CONFIG_FILES_MUST="/etc/krb5.conf /etc/hosts /etc/ctdb/nodes /etc/default/ctdb /etc/resolv.conf /etc/nsswitch.conf /etc/sysctl.conf /etc/samba/smb.conf /etc/fstab /etc/multipath.conf /etc/pam.d/system-auth /etc/default/nfs /etc/exports /etc/vsftpd/vsftpd.conf"
+fi
# list of config files that may exist and should be checked that they
# are the same on the nodes
@@ -115,7 +119,6 @@ show_and_compare_files () {
fmt="$1" ; shift
for f ; do
-
first=true
for n in $nodes ; do