[oe-commits] [meta-openembedded] 61/80: drbd-utils: only rmmod if DRBD is a module

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

joe_macdonald pushed a commit to branch master
in repository meta-openembedded.

commit 446619d5ec45f0480852a6806067c1937b95923a
Author: Jianchuan Wang <jianchuan.wang at windriver.com>
AuthorDate: Thu Aug 31 04:57:32 2017 -0400

    drbd-utils: 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 at localhost:~# /etc/init.d/drbd stop
        Stopping all DRBD resources: ERROR: Module drbd does not exist in
        /proc/modules
    
    Signed-off-by: Jianchuan Wang <jianchuan.wang at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
 ...drbd-tools-only-rmmod-if-DRBD-is-a-module.patch | 39 ++++++++++++++++++++++
 .../recipes-support/drbd/drbd-utils_8.9.6.bb       |  1 +
 2 files changed, 40 insertions(+)

diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch
new file mode 100644
index 0000000..add0b03
--- /dev/null
+++ b/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch
@@ -0,0 +1,39 @@
+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 at localhost:~# /etc/init.d/drbd stop
+    Stopping all DRBD resources: ERROR: Module drbd does not exist in
+    /proc/modules
+
+Signed-off-by: Aws Ismail <aws.ismail at windriver.com>
+Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
+
+[ refresh to 8.4.4: squash Aws' and Jason's patches ]
+Signed-off-by: Michel Thebeau <michel.thebeau at windriver.com>
+
+Signed-off-by: Chen Qi <Qi.Chen at 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
+
diff --git a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
index 5f6c43f..5979fbb 100644
--- a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
+++ b/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
 SRC_URI = "http://oss.linbit.com/drbd/${BP}.tar.gz \
            file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \
+           file://0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch \
           "
 SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b"
 SRC_URI[sha256sum] = "297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.