diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-07-15 21:51:14 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-07-15 21:51:14 +0200 |
| commit | 7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2 (patch) | |
| tree | 278ce67421152231887fb790324751b6bb8bfbe9 | |
| parent | linuxrc: Set got_good_root=1 when we got root via LABEL|UUID|PARTUUID (diff) | |
| download | genkernel-7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2.tar.gz genkernel-7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2.tar.bz2 genkernel-7582b5cde9e0118bc5784d45ab49db8ae7c8a8d2.zip | |
linuxrc: No need to call 'busybox findfs'
Normal findfs is already 'busybox findfs'.
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | defaults/initrd.scripts | 6 | ||||
| -rw-r--r-- | defaults/linuxrc | 8 |
2 files changed, 1 insertions, 13 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index ff832a4..c4a037b 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -779,12 +779,6 @@ find_real_device() { 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) retval=$? fi diff --git a/defaults/linuxrc b/defaults/linuxrc index 83b7572..63e2360 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -616,12 +616,6 @@ do 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) retval=$? fi @@ -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 |