From 54e016ae71ad58bee4af184a97caa1f4e302dfdf Mon Sep 17 00:00:00 2001 From: Steffen Maier Date: Tue, 28 Mar 2023 17:54:45 +0200 Subject: [PATCH] zdev/dracut: use namespace prefix in functions of zdev-lib.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use namespace prefix in functions of zdev-lib.sh to avoid collisions with different modules being sourced in the shell. Github-ID: https://github.com/ibm-s390-linux/s390-tools/pull/158 Reviewed-by: Alexander Egorenkov Reviewed-by: Marc Hartmayer Acked-by: Vineeth Vijayan Acked-by: Peter Oberparleiter Signed-off-by: Steffen Maier Signed-off-by: Jan Höppner --- zdev/dracut/95zdev-kdump/module-setup.sh | 2 +- zdev/dracut/95zdev/module-setup.sh | 2 +- zdev/dracut/95zdev/zdev-lib.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zdev/dracut/95zdev-kdump/module-setup.sh b/zdev/dracut/95zdev-kdump/module-setup.sh index 0bab9af2..300b8e97 100755 --- a/zdev/dracut/95zdev-kdump/module-setup.sh +++ b/zdev/dracut/95zdev-kdump/module-setup.sh @@ -22,7 +22,7 @@ check() { source "${moddir:?}/../95zdev/zdev-lib.sh" # Ensure this module is only included when building kdump initrd - is_kdump || return 1 + zdev_is_kdump || return 1 # Ensure that required tools are available require_binaries chzdev || return 1 diff --git a/zdev/dracut/95zdev/module-setup.sh b/zdev/dracut/95zdev/module-setup.sh index a47495dc..7837890b 100644 --- a/zdev/dracut/95zdev/module-setup.sh +++ b/zdev/dracut/95zdev/module-setup.sh @@ -25,7 +25,7 @@ check() { # Leave kdump device configuration to module zdev-kdump to # ensure a minimal device footprint - is_kdump && return 1 + zdev_is_kdump && return 1 # Ensure that required tools are available require_binaries chzdev lszdev /lib/s390-tools/zdev_id || return 1 diff --git a/zdev/dracut/95zdev/zdev-lib.sh b/zdev/dracut/95zdev/zdev-lib.sh index 9f774435..a7f729f0 100644 --- a/zdev/dracut/95zdev/zdev-lib.sh +++ b/zdev/dracut/95zdev/zdev-lib.sh @@ -10,7 +10,7 @@ # # shellcheck shell=bash -is_kdump() { +zdev_is_kdump() { # https://src.fedoraproject.org/rpms/kexec-tools/c/4eedcae5e1540690a3761857fe2e692774c44960 # https://src.fedoraproject.org/rpms/kexec-tools/blob/rawhide/f/mkdumprd # https://src.fedoraproject.org/rpms/kexec-tools/blob/rawhide/f/dracut-module-setup.sh