diff --git a/drbd-utils-9.17.0.tar.gz b/drbd-utils-9.17.0.tar.gz deleted file mode 100644 index ed7f804fe576e6fea5c5301b665e5396fadf21d9..0000000000000000000000000000000000000000 Binary files a/drbd-utils-9.17.0.tar.gz and /dev/null differ diff --git a/drbd-utils-9.21.4.tar.gz b/drbd-utils-9.21.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e1755d3301959d76e1d32e8e250a93b2c15fe138 Binary files /dev/null and b/drbd-utils-9.21.4.tar.gz differ diff --git a/drbd.service b/drbd.service deleted file mode 100644 index 41be2f3422dac66b387bd9d1b1a0ffbb30ccbb5c..0000000000000000000000000000000000000000 --- a/drbd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Distributed Replicated Block Device -After=systemd-modules-load.service network.target - -[Service] -Type=oneshot -RemainAfterExit=yes - -# load config -ExecStart=/usr/sbin/drbdadm adjust all -# user interruptible version of wait-connect all -ExecStart=/usr/sbin/drbdadm wait-con-int -# disconnect and detach all resources -ExecStop=/usr/sbin/drbdadm down all - -[Install] -WantedBy=multi-user.target diff --git a/drbd.spec b/drbd.spec index c103075998a288176c815b93b9940f538319d4dd..a91f99965687b2b32e799809db8ab4570f3cc202 100644 --- a/drbd.spec +++ b/drbd.spec @@ -1,12 +1,12 @@ Name: drbd Summary: DRBD user-land tools and scripts -Version: 9.17.0 +Version: 9.21.4 Release: 1 Source0: http://www.linbit.com/downloads/%{name}/utils/%{name}-utils-%{version}.tar.gz -Source1: drbd.service Patch0: drbd-utils-9.12.2-disable_xsltproc_network_read.patch Patch1: drbd-utils-9.15.0-glibc2.32_clock_gettime.patch Patch2: drbd-utils-9.15.0-make_configure-workaround.patch + License: GPLv2+ and MIT ExclusiveOS: linux URL: http://www.drbd.org/ @@ -16,11 +16,12 @@ BuildRequires: flex BuildRequires: libxslt BuildRequires: docbook-style-xsl BuildRequires: perl-generators +BuildRequires: po4a +BuildRequires: rubygem-asciidoctor Requires: %{name}-utils = %{version} Requires: %{name}-udev = %{version} BuildRequires: udev BuildRequires: make -BuildRequires: po4a %description DRBD refers to block devices designed as a building block to form high @@ -55,7 +56,7 @@ This is a virtual package, installing the full user-land suite. --with-pacemaker \ --with-rgmanager \ --with-distro=generic \ - --with-initdir=%{_initddir} + --with-systemdunitdir=%{_unitdir} %{make_build} %install @@ -65,8 +66,6 @@ rm -rf $RPM_BUILD_ROOT # Remove old init script, replace with systemd unit file rm -f $RPM_BUILD_ROOT/%{_initddir}/drbd install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} -install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/drbd.service -rm -f $RPM_BUILD_ROOT/drbd.service # Remove old heartbeat files that aren't needed any longer in Fedora rm -rf $RPM_BUILD_ROOT/etc/ha.d @@ -90,12 +89,24 @@ This packages includes the DRBD administration tools. # systemd-related stuff %attr(0644,root,root) %{_unitdir}/drbd.service +%attr(0644,root,root) %{_unitdir}/drbd-demote-or-escalate@.service +%attr(0644,root,root) %{_unitdir}/drbd-lvchange@.service +%attr(0644,root,root) %{_unitdir}/drbd-promote@.service +%attr(0644,root,root) %{_unitdir}/drbd-reconfigure-suspend-or-error@.service +%attr(0644,root,root) %{_unitdir}/drbd-services@.target +%attr(0644,root,root) %{_unitdir}/drbd-wait-promotable@.service +%attr(0644,root,root) %{_unitdir}/drbd@.service +%attr(0644,root,root) %{_unitdir}/drbd@.target +%attr(0644,root,root) %{_unitdir}/ocf.ra@.service %attr(0644,root,root) %{_tmpfilesdir}/%{name}.conf # Yes, these paths are peculiar. Upstream is peculiar. # Be forewarned: rpmlint hates this stuff. %defattr(755,root,root,-) -/lib/drbd/drbd +/lib/drbd/scripts/drbd +/lib/drbd/scripts/drbd-service-shim.sh +/lib/drbd/scripts/drbd-wait-promotable.sh +/lib/drbd/scripts/ocf.ra.wrapper.sh /lib/drbd/drbdadm-* /lib/drbd/drbdsetup-* /usr/lib/drbd/*.sh @@ -111,6 +122,10 @@ This packages includes the DRBD administration tools. %{_mandir}/man5/drbd*gz %{_mandir}/ja/man5/drbd*gz %{_mandir}/ja/man8/drbd*gz +%{_mandir}/man7/drbd*@.service.* +%{_mandir}/man7/drbd*@.target.* +%{_mandir}/man7/drbd.service.* +%{_mandir}/man7/ocf.ra@.service.* %doc scripts/drbd.conf.example %license COPYING %doc ChangeLog @@ -156,6 +171,7 @@ Pacemaker High Availability cluster manager. %files pacemaker %defattr(755,root,root,-) +%dir %{_prefix}/lib/ocf/resource.d/linbit/ %{_prefix}/lib/ocf/resource.d/linbit/drbd %{_prefix}/lib/ocf/resource.d/linbit/drbd-attr %{_prefix}/lib/ocf/resource.d/linbit/drbd.shellfuncs.sh @@ -200,6 +216,9 @@ management utility. %systemd_preun drbd.service %changelog +* Mon Nov 27 2023 liupei - 9.21.4-1 +- update to 9.21.4 + * Fri Mar 11 2022 jiangxinyu - 9.17.0-1 - update to 9.17.0