Cluster Project branch, master, updated. cluster-2.99.04-2-g286416b
fabbione@sourceware.org
fabbione@sourceware.org
Mon Jun 9 11:59:00 GMT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=286416b9fa54c213a400f65d1a7009274ed964ba
The branch, master has been updated
via 286416b9fa54c213a400f65d1a7009274ed964ba (commit)
via 50867c3f79e7f41274f4bdb88e808715e0ef4343 (commit)
from 528524df19cc8bab136bc009010b7c68189a7368 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 286416b9fa54c213a400f65d1a7009274ed964ba
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Mon Jun 9 13:58:21 2008 +0200
[MISC] Whitespace cleanup
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
commit 50867c3f79e7f41274f4bdb88e808715e0ef4343
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date: Mon Jun 9 13:51:03 2008 +0200
[BUILD] Fix file permissions all around
Let make/install.mk to take care of the install permissions.
Don't mangle with tree permissions at all.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
-----------------------------------------------------------------------
Summary of changes:
Makefile | 8 +----
make/defines.mk.input | 4 +-
make/fencebuild.mk | 6 ++--
make/install.mk | 14 ++++----
make/libs.mk | 32 ++++++++++----------
make/man.mk | 10 +++---
6 files changed, 35 insertions(+), 39 deletions(-)
mode change 100755 => 100644 cman/init.d/qdiskd
mode change 100755 => 100644 dlm/tests/usertest/lvb.c
mode change 100755 => 100644 fence/agents/apc/fence_apc.py
mode change 100755 => 100644 fence/agents/apc_snmp/fence_apc_snmp.py
mode change 100755 => 100644 fence/agents/baytech/fence_baytech.pl
mode change 100755 => 100644 fence/agents/bladecenter/fence_bladecenter.py
mode change 100755 => 100644 fence/agents/brocade/fence_brocade.pl
mode change 100755 => 100644 fence/agents/bullpap/fence_bullpap.pl
mode change 100755 => 100644 fence/agents/cpint/fence_cpint.pl
mode change 100755 => 100644 fence/agents/drac/fence_drac.pl
mode change 100755 => 100644 fence/agents/drac/fence_drac5.py
mode change 100755 => 100644 fence/agents/drac/test_drac.sh
mode change 100755 => 100644 fence/agents/egenera/fence_egenera.pl
mode change 100755 => 100644 fence/agents/ibmblade/fence_ibmblade.pl
mode change 100755 => 100644 fence/agents/ilo/fence_ilo.py
mode change 100755 => 100644 fence/agents/lpar/fence_lpar.py
mode change 100755 => 100644 fence/agents/manual/fence_ack_manual.sh
mode change 100755 => 100644 fence/agents/mcdata/fence_mcdata.pl
mode change 100755 => 100644 fence/agents/rsa/fence_rsa.py
mode change 100755 => 100644 fence/agents/rsb/fence_rsb.py
mode change 100755 => 100644 fence/agents/scsi/fence_scsi.pl
mode change 100755 => 100644 fence/agents/scsi/fence_scsi_test.pl
mode change 100755 => 100644 fence/agents/scsi/scsi_reserve
mode change 100755 => 100644 fence/agents/vixel/fence_vixel.pl
mode change 100755 => 100644 fence/agents/vmware/fence_vmware.pl
mode change 100755 => 100644 fence/agents/wti/fence_wti.py
mode change 100755 => 100644 fence/agents/xcat/fence_xcat.pl
mode change 100755 => 100644 fence/agents/zvm/fence_zvm.pl
mode change 100755 => 100644 gfs/gfs_tool/decipher_lockstate_dump
mode change 100755 => 100644 gfs/gfs_tool/parse_lockdump
mode change 100755 => 100644 gfs/init.d/gfs
mode change 100755 => 100644 gfs/libgfs/bio.c
mode change 100755 => 100644 gfs/libgfs/bitmap.c
mode change 100755 => 100644 gfs/libgfs/block_list.c
mode change 100755 => 100644 gfs/libgfs/file.c
mode change 100755 => 100644 gfs/libgfs/fs_bits.c
mode change 100755 => 100644 gfs/libgfs/fs_bmap.c
mode change 100755 => 100644 gfs/libgfs/fs_dir.c
mode change 100755 => 100644 gfs/libgfs/fs_inode.c
mode change 100755 => 100644 gfs/libgfs/inode.c
mode change 100755 => 100644 gfs/libgfs/log.c
mode change 100755 => 100644 gfs/libgfs/ondisk.c
mode change 100755 => 100644 gfs/libgfs/rgrp.c
mode change 100755 => 100644 gfs/libgfs/util.c
mode change 100755 => 100644 gfs2/convert/Makefile
mode change 100755 => 100644 gfs2/init.d/gfs2
mode change 100755 => 100644 gfs2/tool/decipher_lockstate_dump
mode change 100755 => 100644 gfs2/tool/parse_lockdump
mode change 100755 => 100644 rgmanager/src/daemons/tests/gentests.sh
mode change 100755 => 100644 rgmanager/src/daemons/tests/runtests.sh
mode change 100755 => 100644 rgmanager/src/daemons/tests/testlist
mode change 100755 => 100644 rgmanager/src/resources/apache.sh
mode change 100755 => 100644 rgmanager/src/resources/clusterfs.sh
mode change 100755 => 100644 rgmanager/src/resources/fs.sh
mode change 100755 => 100644 rgmanager/src/resources/ip.sh
mode change 100755 => 100644 rgmanager/src/resources/lvm.metadata
mode change 100755 => 100644 rgmanager/src/resources/lvm.sh
mode change 100755 => 100644 rgmanager/src/resources/lvm_by_vg.sh
mode change 100755 => 100644 rgmanager/src/resources/mysql.sh
mode change 100755 => 100644 rgmanager/src/resources/named.sh
mode change 100755 => 100644 rgmanager/src/resources/netfs.sh
mode change 100755 => 100644 rgmanager/src/resources/nfsclient.sh
mode change 100755 => 100644 rgmanager/src/resources/nfsexport.sh
mode change 100755 => 100644 rgmanager/src/resources/ocf-shellfuncs
mode change 100755 => 100644 rgmanager/src/resources/openldap.sh
mode change 100755 => 100644 rgmanager/src/resources/oracledb.sh
mode change 100755 => 100644 rgmanager/src/resources/postgres-8.sh
mode change 100755 => 100644 rgmanager/src/resources/samba.sh
mode change 100755 => 100644 rgmanager/src/resources/script.sh
mode change 100755 => 100644 rgmanager/src/resources/service.sh
mode change 100755 => 100644 rgmanager/src/resources/smb.sh
mode change 100755 => 100644 rgmanager/src/resources/tomcat-5.sh
mode change 100755 => 100644 rgmanager/src/resources/utils/httpd-parse-config.pl
mode change 100755 => 100644 rgmanager/src/resources/utils/named-parse-config.pl
mode change 100755 => 100644 rgmanager/src/resources/utils/tomcat-parse-config.pl
mode change 100755 => 100644 rgmanager/src/resources/vm.sh
mode change 100755 => 100644 scripts/fenceparse
mode change 100755 => 100644 scripts/uninstall.pl
diff --git a/Makefile b/Makefile
index a13937f..ab90beb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,7 @@ SUBDIRS = $(filter-out \
$(if ${without_bindings},bindings) \
, $(REALSUBDIRS))
-all: scripts ${SUBDIRS}
-
-# Fix scripts permissions
-scripts:
- chmod 755 ${SRCDIR}/scripts/*.pl ${SRCDIR}/scripts/fenceparse
+all: ${SUBDIRS}
${SUBDIRS}:
[ -n "${without_$@}" ] || ${MAKE} -C $@ all
@@ -62,4 +58,4 @@ distclean: clean
rm -f *tar.gz
rm -rf build
-.PHONY: scripts ${REALSUBDIRS}
+.PHONY: ${REALSUBDIRS}
diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd
old mode 100755
new mode 100644
diff --git a/dlm/tests/usertest/lvb.c b/dlm/tests/usertest/lvb.c
old mode 100755
new mode 100644
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
old mode 100755
new mode 100644
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py
old mode 100755
new mode 100644
diff --git a/fence/agents/baytech/fence_baytech.pl b/fence/agents/baytech/fence_baytech.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py
old mode 100755
new mode 100644
diff --git a/fence/agents/brocade/fence_brocade.pl b/fence/agents/brocade/fence_brocade.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/cpint/fence_cpint.pl b/fence/agents/cpint/fence_cpint.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py
old mode 100755
new mode 100644
diff --git a/fence/agents/drac/test_drac.sh b/fence/agents/drac/test_drac.sh
old mode 100755
new mode 100644
diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/ibmblade/fence_ibmblade.pl b/fence/agents/ibmblade/fence_ibmblade.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
old mode 100755
new mode 100644
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
old mode 100755
new mode 100644
diff --git a/fence/agents/manual/fence_ack_manual.sh b/fence/agents/manual/fence_ack_manual.sh
old mode 100755
new mode 100644
diff --git a/fence/agents/mcdata/fence_mcdata.pl b/fence/agents/mcdata/fence_mcdata.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py
old mode 100755
new mode 100644
diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py
old mode 100755
new mode 100644
diff --git a/fence/agents/scsi/fence_scsi.pl b/fence/agents/scsi/fence_scsi.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/scsi/fence_scsi_test.pl b/fence/agents/scsi/fence_scsi_test.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/scsi/scsi_reserve b/fence/agents/scsi/scsi_reserve
old mode 100755
new mode 100644
diff --git a/fence/agents/vixel/fence_vixel.pl b/fence/agents/vixel/fence_vixel.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/vmware/fence_vmware.pl b/fence/agents/vmware/fence_vmware.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
old mode 100755
new mode 100644
diff --git a/fence/agents/xcat/fence_xcat.pl b/fence/agents/xcat/fence_xcat.pl
old mode 100755
new mode 100644
diff --git a/fence/agents/zvm/fence_zvm.pl b/fence/agents/zvm/fence_zvm.pl
old mode 100755
new mode 100644
diff --git a/gfs/gfs_tool/decipher_lockstate_dump b/gfs/gfs_tool/decipher_lockstate_dump
old mode 100755
new mode 100644
diff --git a/gfs/gfs_tool/parse_lockdump b/gfs/gfs_tool/parse_lockdump
old mode 100755
new mode 100644
diff --git a/gfs/init.d/gfs b/gfs/init.d/gfs
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/bio.c b/gfs/libgfs/bio.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/bitmap.c b/gfs/libgfs/bitmap.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/block_list.c b/gfs/libgfs/block_list.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/file.c b/gfs/libgfs/file.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/fs_bits.c b/gfs/libgfs/fs_bits.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/fs_bmap.c b/gfs/libgfs/fs_bmap.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/fs_dir.c b/gfs/libgfs/fs_dir.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/fs_inode.c b/gfs/libgfs/fs_inode.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/inode.c b/gfs/libgfs/inode.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/log.c b/gfs/libgfs/log.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/ondisk.c b/gfs/libgfs/ondisk.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/rgrp.c b/gfs/libgfs/rgrp.c
old mode 100755
new mode 100644
diff --git a/gfs/libgfs/util.c b/gfs/libgfs/util.c
old mode 100755
new mode 100644
diff --git a/gfs2/convert/Makefile b/gfs2/convert/Makefile
old mode 100755
new mode 100644
diff --git a/gfs2/init.d/gfs2 b/gfs2/init.d/gfs2
old mode 100755
new mode 100644
diff --git a/gfs2/tool/decipher_lockstate_dump b/gfs2/tool/decipher_lockstate_dump
old mode 100755
new mode 100644
diff --git a/gfs2/tool/parse_lockdump b/gfs2/tool/parse_lockdump
old mode 100755
new mode 100644
diff --git a/make/defines.mk.input b/make/defines.mk.input
index e1c4d2d..b9c6c5f 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -83,5 +83,5 @@ S=$(SRCDIR)/$(THISDIR)
CONFDIR=@CONFDIR@
CONFFILE=@CONFFILE@
-UNINSTALL = @SRCDIR@/scripts/uninstall.pl
-FENCEPARSE = @SRCDIR@/scripts/fenceparse
+UNINSTALL = perl @SRCDIR@/scripts/uninstall.pl
+FENCEPARSE = bash @SRCDIR@/scripts/fenceparse
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 873646e..34a8550 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -1,7 +1,7 @@
ifndef FENCEAGENTSLIB
-ifdef TARGET
-SBINDIRT=$(TARGET)
-endif
+ ifdef TARGET
+ SBINDIRT=$(TARGET)
+ endif
endif
all: $(TARGET)
diff --git a/make/install.mk b/make/install.mk
index 1cc64cd..e1babaf 100644
--- a/make/install.mk
+++ b/make/install.mk
@@ -9,7 +9,7 @@ endif
ifdef INCDIRT
install -d ${incdir}
for i in ${INCDIRT}; do \
- install -m644 $(S)/$$i ${incdir}; \
+ install -m644 $(S)/$$i ${incdir}; \
done
endif
ifdef SBINDIRT
@@ -26,17 +26,17 @@ endif
ifdef INITDT
install -d ${initddir}
for i in ${INITDT}; do \
- if [ -f $(S)/$$i ]; then \
- install -m755 $(S)/$$i ${initddir}; \
- else \
- install -m755 $$i ${initddir}; \
- fi; \
+ if [ -f $(S)/$$i ]; then \
+ install -m755 $(S)/$$i ${initddir}; \
+ else \
+ install -m755 $$i ${initddir}; \
+ fi; \
done
endif
ifdef UDEVT
install -d ${DESTDIR}/etc/udev/rules.d
for i in ${UDEVT}; do \
- install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d; \
+ install -m644 $(S)/$$i ${DESTDIR}/etc/udev/rules.d; \
done
endif
ifdef KMODT
diff --git a/make/libs.mk b/make/libs.mk
index c9221fa..406b7f2 100644
--- a/make/libs.mk
+++ b/make/libs.mk
@@ -1,29 +1,29 @@
# handle objects
ifndef OBJS
- OBJS = $(TARGET).o
+ OBJS = $(TARGET).o
endif
# we always build the static version
ifndef STATICLIB
- STATICLIB = $(TARGET).a
+ STATICLIB = $(TARGET).a
endif
# handle the shared version
ifndef MAKESTATICLIB
- ifndef LIBDIRT
- LIBDIRT=$(TARGET).a \
- $(TARGET).so.$(SOMAJOR).$(SOMINOR)
- endif
- ifndef LIBSYMT
- LIBSYMT=$(TARGET).so \
- $(TARGET).so.$(SOMAJOR)
- endif
- ifndef INCDIRT
- INCDIRT=$(TARGET).h
- endif
- ifndef SHAREDLIB
- SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
- endif
+ ifndef LIBDIRT
+ LIBDIRT=$(TARGET).a \
+ $(TARGET).so.$(SOMAJOR).$(SOMINOR)
+ endif
+ ifndef LIBSYMT
+ LIBSYMT=$(TARGET).so \
+ $(TARGET).so.$(SOMAJOR)
+ endif
+ ifndef INCDIRT
+ INCDIRT=$(TARGET).h
+ endif
+ ifndef SHAREDLIB
+ SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
+ endif
all: $(STATICLIB) $(SHAREDLIB)
diff --git a/make/man.mk b/make/man.mk
index 5cfbadd..b43efc1 100644
--- a/make/man.mk
+++ b/make/man.mk
@@ -2,15 +2,15 @@ all:
install:
for i in ${TARGET}; do \
- p=`echo $$i | sed -e 's#.*\.##g'`; \
- install -d ${mandir}/man$$p; \
- install -m644 $(S)/$$i ${mandir}/man$$p; \
+ p=`echo $$i | sed -e 's#.*\.##g'`; \
+ install -d ${mandir}/man$$p; \
+ install -m644 $(S)/$$i ${mandir}/man$$p; \
done
uninstall:
for i in ${TARGET}; do \
- p=`echo $$i | sed -e 's#.*\.##g'`; \
- ${UNINSTALL} $$i ${mandir}/man$$p; \
+ p=`echo $$i | sed -e 's#.*\.##g'`; \
+ ${UNINSTALL} $$i ${mandir}/man$$p; \
done
clean:
diff --git a/rgmanager/src/daemons/tests/gentests.sh b/rgmanager/src/daemons/tests/gentests.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/daemons/tests/runtests.sh b/rgmanager/src/daemons/tests/runtests.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/daemons/tests/testlist b/rgmanager/src/daemons/tests/testlist
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/apache.sh b/rgmanager/src/resources/apache.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/clusterfs.sh b/rgmanager/src/resources/clusterfs.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/lvm.metadata b/rgmanager/src/resources/lvm.metadata
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/lvm.sh b/rgmanager/src/resources/lvm.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/lvm_by_vg.sh b/rgmanager/src/resources/lvm_by_vg.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/mysql.sh b/rgmanager/src/resources/mysql.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/named.sh b/rgmanager/src/resources/named.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/netfs.sh b/rgmanager/src/resources/netfs.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/nfsclient.sh b/rgmanager/src/resources/nfsclient.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/nfsexport.sh b/rgmanager/src/resources/nfsexport.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/ocf-shellfuncs b/rgmanager/src/resources/ocf-shellfuncs
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/openldap.sh b/rgmanager/src/resources/openldap.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/oracledb.sh b/rgmanager/src/resources/oracledb.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/postgres-8.sh b/rgmanager/src/resources/postgres-8.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/samba.sh b/rgmanager/src/resources/samba.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/script.sh b/rgmanager/src/resources/script.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/service.sh b/rgmanager/src/resources/service.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/smb.sh b/rgmanager/src/resources/smb.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/tomcat-5.sh b/rgmanager/src/resources/tomcat-5.sh
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/utils/httpd-parse-config.pl b/rgmanager/src/resources/utils/httpd-parse-config.pl
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/utils/named-parse-config.pl b/rgmanager/src/resources/utils/named-parse-config.pl
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/utils/tomcat-parse-config.pl b/rgmanager/src/resources/utils/tomcat-parse-config.pl
old mode 100755
new mode 100644
diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh
old mode 100755
new mode 100644
diff --git a/scripts/fenceparse b/scripts/fenceparse
old mode 100755
new mode 100644
diff --git a/scripts/uninstall.pl b/scripts/uninstall.pl
old mode 100755
new mode 100644
hooks/post-receive
--
Cluster Project
More information about the Cluster-cvs
mailing list