------------------------------------------------------------ revno: 420 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Fri 2007-06-01 21:10:49 +1000 message: tidy up the install somewhat modified: Makefile.in makefile.in-20061117234101-o3qt14umlg9en8z0-1 packaging/RHEL/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3 packaging/RHEL/setup/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7 === modified file 'Makefile.in' --- a/Makefile.in 2007-05-29 05:52:03 +0000 +++ b/Makefile.in 2007-06-01 11:10:49 +0000 @@ -117,9 +117,19 @@ install: all mkdir -p $(DESTDIR)$(bindir) mkdir -p $(DESTDIR)$(includedir) - rsync $(BINS) $(DESTDIR)$(bindir) - rsync $(SBINS) $(DESTDIR)$(sbindir) - rsync $(srcdir)/include/ctdb.h $(DESTDIR)$(includedir) + mkdir -p $(DESTDIR)$(etcdir)/ctdb + mkdir -p $(DESTDIR)$(etcdir)/ctdb/events.d + install -m755 bin/ctdb $(DESTDIR)$(bindir) + install -m755 bin/ctdbd $(DESTDIR)$(sbindir) + install -m644 include/ctdb.h $(DESTDIR)$(includedir) + install -m644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3 + install -m755 tools/events $(DESTDIR)$(etcdir)/ctdb + install -m755 tools/statd-callout $(DESTDIR)$(etcdir)/ctdb + install -m755 tools/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d + install -m755 tools/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d + install -m755 tools/onnode.ssh $(DESTDIR)$(bindir) + install -m755 tools/onnode.rsh $(DESTDIR)$(bindir) + ln -sf $(DESTDIR)$(bindir)/onnode.ssh $(DESTDIR)$(bindir)/onnode test: all tests/run_tests.sh
=== modified file 'packaging/RHEL/ctdb.spec' --- a/packaging/RHEL/ctdb.spec 2007-06-01 10:54:26 +0000 +++ b/packaging/RHEL/ctdb.spec 2007-06-01 11:10:49 +0000 @@ -9,12 +9,12 @@ Epoch: 0 License: GNU GPL version 2 Group: System Environment/Daemons -URL: bzr://www.samba.org/~tridge/ctdb/ +URL: http://ctdb.samba.org/ Source: ctdb-%{version}.tar.bz2 Source999: ctdb-setup.tar.bz2 -Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall +Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall /usr/bin/nc Prereq: fileutils sed /etc/init.d Requires: initscripts >= 5.54-1 @@ -66,17 +66,6 @@ install -m644 setup/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb install -m755 setup/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb -install -m755 tools/events $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events -install -m755 tools/events.d/samba $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/samba -install -m755 tools/events.d/nfslock $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/nfslock -install -m755 tools/statd-callout $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/statd-callout -install -m755 tools/onnode.ssh $RPM_BUILD_ROOT%{_bindir} -install -m755 tools/onnode.rsh $RPM_BUILD_ROOT%{_bindir} -ln -sf %{_bindir}/onnode.ssh $RPM_BUILD_ROOT%{_bindir}/onnode - -# unfortunately samba3 needs ctdb_private.h too -install -m644 include/ctdb_private.h $RPM_BUILD_ROOT%{_includedir}/ctdb_private.h - # Remove "*.old" files find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \; === modified file 'packaging/RHEL/setup/ctdb.sysconfig' --- a/packaging/RHEL/setup/ctdb.sysconfig 2007-06-01 03:50:18 +0000 +++ b/packaging/RHEL/setup/ctdb.sysconfig 2007-06-01 11:10:49 +0000 @@ -42,16 +42,6 @@ # the default is 0 # DEBUGLEVEL=0 -# use this to specify any local tcp ports to wait on before starting -# ctdb. Use 445 and 139 for Samba -# the default is not to wait for any local services -# CTDB_WAIT_TCP_PORTS="445 139" - -# use this to specify any local directories to wait on before starting -# ctdb. You should list any critical Samba or NFS shared directories -# the default is not to wait for any local directories -# CTDB_WAIT_DIRECTORIES="/some/directory" - # the shared directory where you want to put statd information on # which clients to notify on a NFS restart # there is no default