commit: 7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Jul 15 19:51:14 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Jul 15 19:51:14 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7582b5cd
linuxrc: No need to call 'busybox findfs' Normal findfs is already 'busybox findfs'. Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/initrd.scripts | 6 ------ defaults/linuxrc | 8 +------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index ff832a4..c4a037b 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -777,12 +777,6 @@ find_real_device() { retval=$? fi - if [ ${retval} -ne 0 ] - then - REAL_DEVICE=$(busybox findfs "${DEVICE}" 2>/dev/null) - retval=$? - fi - if [ ${retval} -ne 0 ] then REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}" 2>/dev/null) diff --git a/defaults/linuxrc b/defaults/linuxrc index 83b7572..63e2360 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -614,12 +614,6 @@ do retval=$? fi - if [ ${retval} -ne 0 ] - then - ROOT_DEV=$(busybox findfs "${REAL_ROOT}" 2>/dev/null) - retval=$? - fi - if [ ${retval} -ne 0 ] then ROOT_DEV=$(blkid -o device -l -t "${REAL_ROOT}" 2>/dev/null) @@ -694,7 +688,7 @@ do if [ "${got_good_root}" != '1' ] then let ROOTDELAY_100MSEC=${ROOTDELAY_100MSEC}-1 - usleep 100 + sleep 0.1s fi done # End of sleep loop waiting on root