mcst-linux-kernel/patches-2024.06.26/zfs-2.1.5/0002-fix-logging-in-zfs-fun...

22 lines
851 B
Diff

Link:
Subject: fix zfs-import init script error
Bug: 104525
Tags: common
LSB, Debian GNU/Linux and derivates use functions from /lib/lsb/init-functions.
OS Elbrus has log_failure_msg, but doesn't have log_begin_msg function.
zfs-import tries to execute login_begin_msg and crashes.
diff -rupN a/etc/zfs/zfs-functions.in b/etc/zfs/zfs-functions.in
--- a/etc/zfs/zfs-functions.in 2023-03-29 19:01:35.894951220 +0300
+++ b/etc/zfs/zfs-functions.in 2023-03-29 19:01:55.540175299 +0300
@@ -25,7 +25,7 @@ fi
# Of course the functions we need are called differently
# on different distributions - it would be way too easy
# otherwise!!
-if type log_failure_msg > /dev/null 2>&1 ; then
+if type log_begin_msg > /dev/null 2>&1 ; then
# LSB functions - fall through
zfs_log_begin_msg() { log_begin_msg "$1"; }
zfs_log_end_msg() { log_end_msg "$1"; }