diff --git a/add_phy_to_block-drbd.diff b/add_phy_to_block-drbd.diff deleted file mode 100644 index 5a4cb74..0000000 --- a/add_phy_to_block-drbd.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: drbd-utils-8.9.0/scripts/block-drbd -=================================================================== ---- drbd-utils-8.9.0.orig/scripts/block-drbd -+++ drbd-utils-8.9.0/scripts/block-drbd -@@ -250,7 +250,7 @@ case "$command" in - fi - - case $t in -- drbd) -+ drbd|phy) - drbd_resource=$p - drbd_role="$(drbdadm role $drbd_resource)" - drbd_lrole="${drbd_role%%/*}" -@@ -278,7 +278,7 @@ case "$command" in - - remove) - case $t in -- drbd) -+ drbd|phy) - p=$(xenstore_read "$XENBUS_PATH/params") - drbd_resource=$p - drbd_role="$(drbdadm role $drbd_resource)" diff --git a/drbd-utils-8.9.0.tar.bz2 b/drbd-utils-8.9.0.tar.bz2 deleted file mode 100644 index bf91608..0000000 --- a/drbd-utils-8.9.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce5a50844e48f542643e4f768665d4d4d966f64326dd2116b1bc1a444dd73a86 -size 494705 diff --git a/drbd-utils-8.9.1.tar.bz2 b/drbd-utils-8.9.1.tar.bz2 new file mode 100644 index 0000000..0493fa4 --- /dev/null +++ b/drbd-utils-8.9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c57a98e01f109e12fc2f758816591522263c7001232054b873fea1e04414d51e +size 488669 diff --git a/drbd-utils.changes b/drbd-utils.changes index 12349a3..c5f620c 100644 --- a/drbd-utils.changes +++ b/drbd-utils.changes @@ -1,7 +1,29 @@ + +------------------------------------------------------------------- +Sat Oct 11 10:13:33 UTC 2014 - lwang@suse.com + +- update to drbd-utils-8.9.1 +- drbd-utils-8.9.1 + * add DRBD systemd service + * new configuration options socket-check-timeout and csums-after-crash-only + * update xen block-drbd helper: allow for type "phy" + * update udev rules and move from /etc/ to /lib/ + * fix various regressions/fallout from the kernel/userland package split, + re-add scripts drbddisk and drbdupper, + re-add "become-on-primary" feature to init script + * crm-fence-peer.sh: improve detection of "clean down" + * updated fencing scripts stonith_admin-fence-peer.sh and rhcs_fence + * improved "proxy" configuration section parsing + * added manpage for drbd-overview, minor review of man pages + * build: various changes in configure.ac, makefiles, debian/* and spec file +- Upstream version cs: 87039e4993dc682232ec6365900ace657e060c73 +- Delete patch: + add_phy_to_block-drbd.diff: included in upstream latest version + ------------------------------------------------------------------- Fri Jul 11 01:53:22 UTC 2014 - lwang@suse.com -- created drbd-utils-8.9.0 (drbd tools) +- created drbd-utils-8.9.0 (drbd tools ) (since 8.4.5 drbd only includes kernel space source) - drbd-utils-8.9.0 * Initial release of unified drbd-utils diff --git a/drbd-utils.spec b/drbd-utils.spec index 6709ce4..985f0bd 100644 --- a/drbd-utils.spec +++ b/drbd-utils.spec @@ -16,7 +16,7 @@ # Name: drbd-utils -Version: 8.9.0 +Version: 8.9.1 Release: 0 Summary: Distributed Replicated Block Device License: GPL-2.0+ @@ -26,7 +26,6 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: init-script-fixes.diff -Patch2: add_phy_to_block-drbd.diff Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -40,13 +39,18 @@ Obsoletes: drbd-utils < %{version} Provides: drbd-xen = %{version} Obsoletes: drbd-xen < %{version} %endif -BuildRequires: bison -BuildRequires: flex -BuildRequires: udev +BuildRequires: gcc +BuildRequires: make +BuildRequires: glibc-devel +BuildRequires: bison +BuildRequires: flex +BuildRequires: libxslt +BuildRequires: udev +BuildRequires: docbook-xsl-stylesheets Provides: drbd-control Provides: drbdsetup BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: drbd +Requires: drbd-kmp Requires(post): %insserv_prereq %fillup_prereq Requires(preun): %insserv_prereq %fillup_prereq Requires(postun): %insserv_prereq fileutils @@ -59,7 +63,6 @@ raid 1. It is a building block for setting up clusters. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build PATH=/sbin:$PATH %configure \ @@ -78,7 +81,6 @@ make OPTFLAGS="%{optflags}" %{?_smp_mflags} %install %make_install - mkdir -p %{buildroot}%{_localstatedir}/lib/drbd # # and I only want to install a hint to the example conf @@ -95,7 +97,7 @@ rm -rf %{buildroot}%{_sysconfdir}/xen %endif mkdir -p %{buildroot}/usr/lib/udev/rules.d -mv %{buildroot}/etc/udev/rules.d/65-drbd.rules %{buildroot}/usr/lib/udev/rules.d +mv %{buildroot}/lib/udev/65-drbd.rules* %{buildroot}/usr/lib/udev/rules.d/65-drbd.rules %post %{fillup_and_insserv} @@ -131,7 +133,7 @@ mv %{buildroot}/etc/udev/rules.d/65-drbd.rules %{buildroot}/usr/lib/udev/rules.d %{_prefix}/lib/ocf/resource.d/linbit/drbd %dir /usr/lib/udev %dir /usr/lib/udev/rules.d -/usr/lib/udev/rules.d/65-drbd.rules +%config /usr/lib/udev/rules.d/65-drbd.rules %config %{_sysconfdir}/init.d/drbd %defattr(-, root, root) %{_localstatedir}/lib/drbd diff --git a/init-script-fixes.diff b/init-script-fixes.diff index 15a71f1..8257989 100644 --- a/init-script-fixes.diff +++ b/init-script-fixes.diff @@ -1,7 +1,7 @@ -Index: drbd-utils-8.9.0/scripts/drbd +Index: drbd-utils-8.9.1/scripts/drbd =================================================================== ---- drbd-utils-8.9.0.orig/scripts/drbd -+++ drbd-utils-8.9.0/scripts/drbd +--- drbd-utils-8.9.1.orig/scripts/drbd ++++ drbd-utils-8.9.1/scripts/drbd @@ -9,14 +9,14 @@ # ### BEGIN INIT INFO @@ -22,18 +22,18 @@ Index: drbd-utils-8.9.0/scripts/drbd # X-Interactive: true # Short-Description: Control drbd resources. ### END INIT INFO -@@ -161,7 +161,6 @@ case "$1" in +@@ -170,7 +170,6 @@ case "$1" in done done - [ -d /var/lock/subsys ] && touch /var/lock/subsys/drbd # for RedHat + run_hook start_before-wait $DRBDADM wait-con-int # User interruptible version of wait-connect all - - log_end_msg 0 -@@ -193,7 +192,6 @@ case "$1" in - $RMMOD drbd && break + run_hook start +@@ -209,7 +208,6 @@ case "$1" in fi done + run_hook stop - [ -f /var/lock/subsys/drbd ] && rm /var/lock/subsys/drbd log_end_msg 0 ;;