[SCM] CTDB repository - branch master updated - 8f6cd88e74de24af8dde2b6cabb2348c4f914b99

[Ronnie Sahlberg]

The branch, master has been updated
       via  8f6cd88e74de24af8dde2b6cabb2348c4f914b99 (commit)
      from  77255bb5523b8d132770a0a7d4ba29ec9e5043cc (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8f6cd88e74de24af8dde2b6cabb2348c4f914b99
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jul 9 10:24:19 2008 +1000

     mark /etc/ctdb/functions as a config file to keep rpmlint happy

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in             |    2 +-
 config/functions        |    1 -
 packaging/RPM/ctdb.spec |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index 161e2e9..f85770f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,7 +176,7 @@ install: all
 	${INSTALLCMD} -m 755 bin/smnotify $(DESTDIR)$(bindir)
 	${INSTALLCMD} -m 644 include/ctdb.h $(DESTDIR)$(includedir)
 	${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3
-	${INSTALLCMD} -m 755 config/functions $(DESTDIR)$(etcdir)/ctdb
+	${INSTALLCMD} -m 644 config/functions $(DESTDIR)$(etcdir)/ctdb
 	${INSTALLCMD} -m 755 config/statd-callout $(DESTDIR)$(etcdir)/ctdb
 	${INSTALLCMD} -m 644 config/events.d/README $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/00.ctdb $(DESTDIR)$(etcdir)/ctdb/events.d
diff --git a/config/functions b/config/functions
index f95557d..d15c4b5 100644
--- a/config/functions
+++ b/config/functions
@@ -1,4 +1,3 @@
-#!/bin/sh
 # utility functions for ctdb event scripts
 
 #######################################
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 0db2b71..b62e5ad 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -90,9 +90,9 @@ fi
 %defattr(-,root,root)
 
 %config(noreplace) %{_sysconfdir}/sysconfig/ctdb
+%config(noreplace) %{_sysconfdir}/ctdb/functions
 %attr(755,root,root) %{initdir}/ctdb
 
-%{_sysconfdir}/ctdb/functions
 %{_sysconfdir}/ctdb/events.d/README
 %{_sysconfdir}/ctdb/events.d/00.ctdb
 %{_sysconfdir}/ctdb/events.d/10.interface


-- 
CTDB repository