From 12efc5cff6e4a6e77b75f6e2aa8bb3cb0d928bee Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 12 Oct 2023 08:49:48 +0200 Subject: [PATCH] remove check on /dev and /proc --- usr/bin/archboot-cpio.sh | 6 +----- usr/lib/archboot/cpio.sh | 18 ------------------ 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/usr/bin/archboot-cpio.sh b/usr/bin/archboot-cpio.sh index e4b04d6b7..db6c8e67b 100755 --- a/usr/bin/archboot-cpio.sh +++ b/usr/bin/archboot-cpio.sh @@ -172,11 +172,7 @@ done if [[ -t 1 ]] && (( _optcolor )); then try_enable_color fi -# insist that /proc and /dev be mounted (important for chroots) -# NOTE: avoid using mountpoint for this -- look for the paths that we actually -# use in mkinitcpio. Avoids issues like FS#26344. -[[ -e /proc/self/mountinfo ]] || die "/proc must be mounted!" -[[ -e /dev/fd ]] || die "/dev must be mounted!" + #shellcheck disable="SC1090" ! . "${_CONFIG}" 2>"${_NO_LOG}" && die "Failed to read configuration '%s'" "${_CONFIG}" if [[ -z "${KERNEL}" ]]; then diff --git a/usr/lib/archboot/cpio.sh b/usr/lib/archboot/cpio.sh index 3db1964da..2a1064baa 100644 --- a/usr/lib/archboot/cpio.sh +++ b/usr/lib/archboot/cpio.sh @@ -4,24 +4,6 @@ # simplified, stripped down, optimized for size and speed # by Tobias Powalowski -msg() { - local mesg="$1"; shift - # shellcheck disable=SC2059 - printf "$_color_green==>$_color_none $_color_bold$mesg$_color_none\n" "$@" >&1 -} - -msg2() { - local mesg="$1"; shift - # shellcheck disable=SC2059 - printf " $_color_blue->$_color_none $_color_bold$mesg$_color_none\n" "$@" >&1 -} - -warning() { - local mesg="$1"; shift - # shellcheck disable=SC2059 - printf "$_color_yellow==> WARNING:$_color_none $_color_bold$mesg$_color_none\n" "$@" >&2 -} - error() { local mesg="$1"; shift # shellcheck disable=SC2059