drbd-utils: update to 9.8.0

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Oleksandr Kravchuk
2019-04-07 17:11:05 +02:00
committed by Khem Raj
parent 1077f7da32
commit 2285583bb8
2 changed files with 3 additions and 47 deletions
@@ -1,43 +0,0 @@
Subject: drbd-tools: only rmmod if DRBD is a module
Account for the case if the DRBD drive is built into
the kernel. Otherwise, errors, like the following,
will occur:
root@localhost:~# /etc/init.d/drbd stop
Stopping all DRBD resources: ERROR: Module drbd
does not exist in /proc/modules
Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/2]
Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
[ refresh to 8.4.4: squash Aws' and Jason's patches ]
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
scripts/drbd | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/drbd b/scripts/drbd
index 20bf628..de589dc 100755
--- a/scripts/drbd
+++ b/scripts/drbd
@@ -241,7 +241,9 @@ case "$1" in
if [ -d /sys/module/drbd/holders ]; then
(cd /sys/module/drbd/holders; for tr in *; do [ -d ${tr} ] && ${RMMOD} ${tr}; done)
fi
- $RMMOD drbd && break
+ if [ ! -z "$(cat /proc/modules | grep -w drbd)" ]; then
+ $RMMOD drbd && break
+ fi
fi
done
run_hook stop
--
1.9.1
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils \
git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers \
file://0001-drbd-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch \
"
# v9.5.0
SRCREV_drbd-utils = "ee126652638328b55dc6bff47d07d6161ab768db"
SRCREV_drbd-headers = "b47cc11bcabe1a65c40ad23f71dcaf2da6419630"
# v9.8.0
SRCREV_drbd-utils = "c30216b49330216bf8a567b7727da6e24f099f08"
SRCREV_drbd-headers = "2357a11fb49bcbadf6b490e6d4cfe982a3d24813"
S = "${WORKDIR}/git"