zdev/dracut: use namespace prefix in functions of zdev-lib.sh

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 <egorenar@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Acked-by: Vineeth Vijayan <vneethv@linux.ibm.com>
Acked-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Steffen Maier
2023-03-28 17:54:45 +02:00
committed by Jan Höppner
parent 6b53378839
commit 54e016ae71
3 changed files with 3 additions and 3 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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