| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | Subject: drbd-tools: only rmmod if DRBD is a module |
| 2 | |
| 3 | Account for the case if the DRBD drive is built into |
| 4 | the kernel. Otherwise, errors, like the following, |
| 5 | will occur: |
| 6 | |
| 7 | root@localhost:~# /etc/init.d/drbd stop |
| 8 | Stopping all DRBD resources: ERROR: Module drbd |
| 9 | does not exist in /proc/modules |
| 10 | |
| 11 | Upstream-Status: Submitted [https://github.com/LINBIT/drbd-utils/pull/2] |
| 12 | |
| 13 | Signed-off-by: Aws Ismail <aws.ismail@windriver.com> |
| 14 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> |
| 15 | |
| 16 | [ refresh to 8.4.4: squash Aws' and Jason's patches ] |
| 17 | Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com> |
| 18 | |
| 19 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
| 20 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 21 | |
| 22 | --- |
| 23 | scripts/drbd | 4 +++- |
| 24 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 25 | |
| 26 | diff --git a/scripts/drbd b/scripts/drbd |
| 27 | index 20bf628..de589dc 100755 |
| 28 | --- a/scripts/drbd |
| 29 | +++ b/scripts/drbd |
| 30 | @@ -241,7 +241,9 @@ case "$1" in |
| 31 | if [ -d /sys/module/drbd/holders ]; then |
| 32 | (cd /sys/module/drbd/holders; for tr in *; do [ -d ${tr} ] && ${RMMOD} ${tr}; done) |
| 33 | fi |
| 34 | - $RMMOD drbd && break |
| 35 | + if [ ! -z "$(cat /proc/modules | grep -w drbd)" ]; then |
| 36 | + $RMMOD drbd && break |
| 37 | + fi |
| 38 | fi |
| 39 | done |
| 40 | run_hook stop |
| 41 | -- |
| 42 | 1.9.1 |
| 43 | |