From c50757b2f17abb5e26d069b280933451f6190829 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Thu, 8 Jun 2023 17:59:35 +0800 Subject: dmverity: Suppress the realpath errors If we use a non PARTUUID root parameter, we would always get a error like below: realpath: /dev/disk/by-partuuid//dev/mmcblk0p2: No such file or directory This seems pretty confusion and it also seems no need to emit this kind of error when we are waiting for the root device. So suppress all the realpath errors. Signed-off-by: Kevin Hao Signed-off-by: Armin Kuster --- recipes-core/initrdscripts/initramfs-framework-dm/dmverity | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-core/initrdscripts/initramfs-framework-dm/dmverity b/recipes-core/initrdscripts/initramfs-framework-dm/dmverity index c815940..71afc91 100644 --- a/recipes-core/initrdscripts/initramfs-framework-dm/dmverity +++ b/recipes-core/initrdscripts/initramfs-framework-dm/dmverity @@ -14,7 +14,7 @@ dmverity_run() { C=0 delay=${bootparam_rootdelay:-1} timeout=${bootparam_roottimeout:-5} - RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})" + RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=} 2>/dev/null)" while [ ! -b "${RDEV}" ]; do if [ $(( $C * $delay )) -gt $timeout ]; then fatal "Root device resolution failed" @@ -23,22 +23,22 @@ dmverity_run() { case "${bootparam_root}" in ID=*) - RDEV="$(realpath /dev/disk/by-id/${bootparam_root#ID=})" + RDEV="$(realpath /dev/disk/by-id/${bootparam_root#ID=} 2>/dev/null)" ;; LABEL=*) - RDEV="$(realpath /dev/disk/by-label/${bootparam_root#LABEL=})" + RDEV="$(realpath /dev/disk/by-label/${bootparam_root#LABEL=} 2>/dev/null)" ;; PARTLABEL=*) - RDEV="$(realpath /dev/disk/by-partlabel/${bootparam_root#PARTLABEL=})" + RDEV="$(realpath /dev/disk/by-partlabel/${bootparam_root#PARTLABEL=} 2>/dev/null)" ;; PARTUUID=*) - RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})" + RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=} 2>/dev/null)" ;; PATH=*) - RDEV="$(realpath /dev/disk/by-path/${bootparam_root#PATH=})" + RDEV="$(realpath /dev/disk/by-path/${bootparam_root#PATH=} 2>/dev/null)" ;; UUID=*) - RDEV="$(realpath /dev/disk/by-uuid/${bootparam_root#UUID=})" + RDEV="$(realpath /dev/disk/by-uuid/${bootparam_root#UUID=} 2>/dev/null)" ;; *) RDEV="${bootparam_root}" -- cgit v1.2.3-54-g00ecf