[Debian-ha-commits] [ocfs2-tools] 09/11: debian/patches: fix error printed by o2cb stop

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit 6862a1ed0f53a655688e020746690f4971e096bf
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Wed Jan 24 14:58:11 2018 +0100

    debian/patches: fix error printed by o2cb stop
---
 debian/patches/o2cb-stop-error.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/o2cb-stop-error.patch b/debian/patches/o2cb-stop-error.patch
new file mode 100644
index 0000000..fd63988
--- /dev/null
+++ b/debian/patches/o2cb-stop-error.patch
@@ -0,0 +1,24 @@
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2018-01-24
+Subject: Fix error printed by service o2cb stop
+ Unloading module "ocfs2_dlmfs": OK
+ Unloading module "ocfs2_stack_o2cb": OK
+ /usr/lib/ocfs2-tools/o2cb: line 1151: read: read error: 0: No such device
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/vendor/common/o2cb.init.sh
++++ b/vendor/common/o2cb.init.sh
+@@ -1148,11 +1148,11 @@
+     # we have nothing to do.
+     [ ! -e "$LOADED_PLUGINS_FILE" ] && return 2
+ 
+-    while read plugin
++    for plugin in $(cat "$LOADED_PLUGINS_FILE")
+     do
+         unload_module "ocfs2_stack_${plugin}"
+         if_fail $? "Unable to unload ocfs2_stack_${plugin}"
+-    done <"$LOADED_PLUGINS_FILE"
++    done
+ 
+     unload_module "ocfs2_stackglue"
+     if_fail $? "Unable to unload ocfs2_stackglue"
diff --git a/debian/patches/series b/debian/patches/series
index bd8637f..0e2f7dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fortify-source.patch
 glibc-2.26.patch
 makedev.patch
 spelling.patch
+o2cb-stop-error.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git