[PATCHv2] module-setup: re-fix 99kdumpbase network dependency"
by Pingfan Liu
In commit a431a7e354b (module-setup: fix 99kdumpbase network dependency),
the statement for OR operation is still wrong.
The OR condition statement should be: if a || b
Signed-off-by: Pingfan Liu <piliu(a)redhat.com>
---
dracut-module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index b186b38..74c2f48 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -40,7 +40,7 @@ depends() {
_dep="$_dep drm"
fi
- if is_generic_fence_kdump -o is_pcs_fence_kdump; then
+ if is_generic_fence_kdump || is_pcs_fence_kdump; then
_dep="$_dep network"
fi
--
2.7.5
4 years, 6 months
[PATCH] Revert "module-setup: fix 99kdumpbase network dependency"
by Pingfan Liu
This reverts commit a431a7e354b82a1a5250e63bbc1277f17c93901c.
Either is_generic_fence_kdump or is_pcs_fence_kdump needs net module to
send msg to partner when in kdump kernel. It has nothing to do with local
dump.
And the OR condition statement should be
if [ a -o b] or if a || b
Signed-off-by: Pingfan Liu <piliu(a)redhat.com>
---
dracut-module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index b186b38..537522e 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -40,7 +40,7 @@ depends() {
_dep="$_dep drm"
fi
- if is_generic_fence_kdump -o is_pcs_fence_kdump; then
+ if [ is_generic_fence_kdump -o is_pcs_fence_kdump ]; then
_dep="$_dep network"
fi
--
2.7.5
4 years, 6 months
[PATCH] kdumpctl: bail out immediately if host key verification failed
by Pingfan Liu
In kdump.conf, if sshkey points to an invalid ssh key, 'kdumpctl restart'
can bail out immediately instead of retry.
Signed-off-by: Pingfan Liu <piliu(a)redhat.com>
---
kdumpctl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kdumpctl b/kdumpctl
index dc0c64b..048e9f5 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -755,7 +755,7 @@ check_and_wait_network_ready()
fi
# if server removes the authorized_keys or, no /root/.ssh/kdump_id_rsa
- echo $errmsg | grep -q "Permission denied\|No such file or directory"
+ echo $errmsg | grep -q "Permission denied\|No such file or directory\|Host key verification failed"
if [ $? -eq 0 ]; then
echo "Could not create $DUMP_TARGET:$SAVE_PATH, you probably need to run \"kdumpctl propagate\"" >&2
return 1
--
2.7.5
4 years, 6 months