init.d/sanlock | 2
sanlock.spec | 277 ---------------------------------------------------------
2 files changed, 1 insertion(+), 278 deletions(-)
New commits:
commit 5517b7c61d15734388413d67720089b7e9e88928
Author: David Teigland <teigland(a)redhat.com>
Date: Mon Jul 23 09:21:10 2012 -0500
remove spec file
I've not been able to keep this updated or properly in sync
with the "real" copies.
Signed-off-by: David Teigland <teigland(a)redhat.com>
diff --git a/sanlock.spec b/sanlock.spec
deleted file mode 100644
index 56b861c..0000000
--- a/sanlock.spec
+++ /dev/null
@@ -1,277 +0,0 @@
-Name: sanlock
-Version: 2.3
-Release: 4%{?dist}
-Summary: A shared disk lock manager
-
-Group: System Environment/Base
-License: GPLv2 and GPLv2+ and LGPLv2+
-URL:
https://fedorahosted.org/sanlock/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libblkid-devel libaio-devel python python-devel
-Requires: %{name}-lib = %{version}-%{release}
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Source0:
https://fedorahosted.org/releases/s/a/sanlock/%{name}-%{version}.tar.gz
-
-%if 0%{?fedora} >= 16
-BuildRequires: systemd-units
-%endif
-
-%description
-sanlock uses disk paxos to manage leases on shared storage.
-Hosts connected to a common SAN can use this to synchronize their
-access to the shared disks.
-
-%prep
-%setup -q
-
-%build
-# upstream does not require configure
-# upstream does not support _smp_mflags
-CFLAGS=$RPM_OPT_FLAGS make -C wdmd
-CFLAGS=$RPM_OPT_FLAGS make -C src
-CFLAGS=$RPM_OPT_FLAGS make -C python
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make -C src \
- install LIBDIR=%{_libdir} \
- DESTDIR=$RPM_BUILD_ROOT
-make -C wdmd \
- install LIBDIR=%{_libdir} \
- DESTDIR=$RPM_BUILD_ROOT
-make -C python \
- install LIBDIR=%{_libdir} \
- DESTDIR=$RPM_BUILD_ROOT
-
-%if 0%{?fedora} >= 16
-install -D -m 0755 init.d/sanlock $RPM_BUILD_ROOT/lib/systemd/systemd-sanlock
-install -D -m 0644 init.d/sanlock.service $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service
-install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/lib/systemd/systemd-wdmd
-install -D -m 0644 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service
-%else
-install -D -m 755 init.d/sanlock $RPM_BUILD_ROOT/%{_initddir}/sanlock
-install -D -m 755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd
-%endif
-
-install -Dm 0644 src/logrotate.sanlock \
- $RPM_BUILD_ROOT/etc/logrotate.d/sanlock
-
-install -Dm 0644 src/sysconfig.sanlock \
- $RPM_BUILD_ROOT/etc/sysconfig/sanlock
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-getent group sanlock > /dev/null || /usr/sbin/groupadd \
- -g 179 sanlock
-getent passwd sanlock > /dev/null || /usr/sbin/useradd \
- -u 179 -c "sanlock" -s /sbin/nologin -r \
- -g 179 -d /var/run/sanlock sanlock
-
-%post
-if [ $1 -eq 1 ] ; then
-%if 0%{?fedora} >= 16
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%else
- /sbin/chkconfig --add sanlock
- /sbin/chkconfig --add wdmd
-%endif
-fi
-
-%preun
-if [ $1 = 0 ]; then
-%if 0%{?fedora} >= 16
- /bin/systemctl --no-reload sanlock.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload wdmd.service > /dev/null 2>&1 || :
- /bin/systemctl stop sanlock.service > /dev/null 2>&1 || :
- /bin/systemctl stop wdmd.service > /dev/null 2>&1 || :
-%else
- /sbin/service sanlock stop > /dev/null 2>&1
- /sbin/service wdmd stop > /dev/null 2>&1
- /sbin/chkconfig --del sanlock
- /sbin/chkconfig --del wdmd
-%endif
-fi
-
-%postun
-if [ $1 -ge 1 ] ; then
-%if 0%{?fedora} >= 16
- /bin/systemctl try-restart sanlock.service >/dev/null 2>&1 || :
- /bin/systemctl try-restart wdmd.service >/dev/null 2>&1 || :
-%else
- /sbin/service sanlock condrestart >/dev/null 2>&1 || :
- /sbin/service wdmd condrestart >/dev/null 2>&1 || :
-%endif
-fi
-
-%files
-%defattr(-,root,root,-)
-%if 0%{?fedora} >= 16
-/lib/systemd/systemd-sanlock
-/lib/systemd/systemd-wdmd
-%{_unitdir}/sanlock.service
-%{_unitdir}/wdmd.service
-%else
-%{_initddir}/sanlock
-%{_initddir}/wdmd
-%endif
-%{_sbindir}/sanlock
-%{_sbindir}/wdmd
-%{_mandir}/man8/wdmd*
-%{_mandir}/man8/sanlock*
-%config(noreplace) %{_sysconfdir}/logrotate.d/sanlock
-%config(noreplace) %{_sysconfdir}/sysconfig/sanlock
-
-%package lib
-Summary: A shared disk lock manager library
-Group: System Environment/Libraries
-
-%description lib
-The %{name}-lib package contains the runtime libraries for sanlock,
-a shared disk lock manager.
-Hosts connected to a common SAN can use this to synchronize their
-access to the shared disks.
-
-%post lib -p /sbin/ldconfig
-
-%postun lib -p /sbin/ldconfig
-
-%files lib
-%defattr(-,root,root,-)
-%{_libdir}/libsanlock.so.*
-%{_libdir}/libsanlock_client.so.*
-%{_libdir}/libwdmd.so.*
-
-%package python
-Summary: Python bindings for the sanlock library
-Group: Development/Libraries
-Requires: %{name}-lib = %{version}-%{release}
-
-%description python
-The %{name}-python package contains a module that permits applications
-written in the Python programming language to use the interface
-supplied by the sanlock library.
-
-%files python
-%defattr(-,root,root,-)
-%{python_sitearch}/Sanlock-1.0-py*.egg-info
-%{python_sitearch}/sanlock.so
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-lib = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/libwdmd.so
-%{_includedir}/wdmd.h
-%{_libdir}/libsanlock.so
-%{_libdir}/libsanlock_client.so
-%{_includedir}/sanlock.h
-%{_includedir}/sanlock_rv.h
-%{_includedir}/sanlock_admin.h
-%{_includedir}/sanlock_resource.h
-%{_includedir}/sanlock_direct.h
-
-%changelog
-* Mon Jun 18 2012 David Teigland <teigland(a)redhat.com> - 2.3-4
-- Require systemd-units
-
-* Fri Jun 15 2012 David Teigland <teigland(a)redhat.com> - 2.3-3
-- Require useradd and groupadd
-
-* Mon Jun 04 2012 David Teigland <teigland(a)redhat.com> - 2.3-2
-- Remove exclusive arch
-
-* Wed May 30 2012 David Teigland <teigland(a)redhat.com> - 2.3-1
-- Update to sanlock-2.3
-
-* Fri May 25 2012 Federico Simoncelli <fsimonce(a)redhat.com> 2.2-2
-- Support multiple platforms in the spec file
-
-* Mon May 07 2012 David Teigland <teigland(a)redhat.com> - 2.2-1
-- Update to sanlock-2.2
-
-* Thu Apr 05 2012 David Teigland <teigland(a)redhat.com> - 2.1-2
-- Install service files instead of init files
-
-* Wed Mar 21 2012 David Teigland <teigland(a)redhat.com> - 2.1-1
-- Update to sanlock-2.1
-
-* Fri Mar 02 2012 David Teigland <teigland(a)redhat.com> - 2.0-1
-- Update to sanlock-2.0
-
-* Tue Sep 20 2011 David Teigland <teigland(a)redhat.com> - 1.8-2
-- fix useradd command in spec file
-
-* Fri Sep 16 2011 Chris Feist <cfeist(a)redhat.com - 1.8-1
-- Update to sanlock-1.8
-
-* Fri Aug 19 2011 Dan HorĂ¡k <dan[at]danny.cz> - 1.6-2
-- build on all arches again
-
-* Sun Aug 07 2011 Chris Feist <cfeist(a)redhat.com> - 1.7-4
-- Fix for minor file include issues
-
-* Fri Aug 05 2011 David Teigland <teigland(a)redhat.com> - 1.7-3
-- fix man page mode
-
-* Fri Aug 05 2011 David Teigland <teigland(a)redhat.com> - 1.7-1
-- Update to sanlock-1.7
-
-* Fri Jul 08 2011 David Teigland <teigland(a)redhat.com> - 1.6-1
-- Update to sanlock-1.6
-
-* Thu Jun 30 2011 David Teigland <teigland(a)redhat.com> - 1.5-1
-- Update to sanlock-1.5
-
-* Tue Jun 21 2011 David Teigland <teigland(a)redhat.com> - 1.4-1
-- Update to sanlock-1.4
-
-* Fri Jun 10 2011 David Teigland <teigland(a)redhat.com> - 1.3-6
-- fix python version, build i686 also
-
-* Thu Jun 09 2011 David Teigland <teigland(a)redhat.com> - 1.3-5
-- build exclusive x86_64, at least for now
-
-* Thu Jun 09 2011 David Teigland <teigland(a)redhat.com> - 1.3-4
-- build only x86_64, at least for now
-
-* Thu Jun 09 2011 David Teigland <teigland(a)redhat.com> - 1.3-3
-- fix libwdmd linking
-
-* Thu Jun 09 2011 David Teigland <teigland(a)redhat.com> - 1.3-2
-- shut up build warnings for wdmd and sanlock
-
-* Thu Jun 09 2011 David Teigland <teigland(a)redhat.com> - 1.3-1
-- Update to sanlock-1.3
-
-* Mon May 09 2011 Chris Feist <cfeist(a)redhat.com> - 1.2.0-3
-- Add python and python-devel to build requires
-
-* Mon May 09 2011 Chris Feist <cfeist(a)redhat.com> - 1.2.0-1
-- Use latest sources
-- Sync .spec file
-
-* Mon Apr 4 2011 Federico Simoncelli <fsimonce(a)redhat.com> - 1.1.0-3
-- Add sanlock_admin.h header
-
-* Fri Feb 18 2011 Chris Feist <cfeist(a)redhat.com> - 1.1.0-2
-- Fixed install for wdmd
-
-* Thu Feb 17 2011 Chris Feist <cfeist(a)redhat.com> - 1.1.0-1
-- Updated to latest sources
-- Now include wdmd
-
-* Tue Feb 8 2011 Angus Salkeld <asalkeld(a)redhat.com> - 1.0-2
-- SPEC: Add docs and make more consistent with the fedora template
-
-* Mon Jan 10 2011 Fabio M. Di Nitto <fdinitto(a)redhat.com> - 1.0-1
-- first cut at rpm packaging
commit 5c9e1a0af8486b01d461beb76d785e9d4c917284
Author: David Teigland <teigland(a)redhat.com>
Date: Mon Jul 23 09:17:52 2012 -0500
Revert "init: make explicit to run sanlock as root"
This reverts commit 6cead337ff6c065a983e9d4e539fb28f3b812498.
diff --git a/init.d/sanlock b/init.d/sanlock
index f68ac14..bd8dccb 100644
--- a/init.d/sanlock
+++ b/init.d/sanlock
@@ -40,7 +40,7 @@ start() {
fi
echo -n $"Starting $prog: "
- daemon --user root $prog daemon $SANLOCKOPTS
+ daemon $prog daemon $SANLOCKOPTS
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile