From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26801138347 for ; Sun, 5 Jan 2020 21:18:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45F85E08DB; Sun, 5 Jan 2020 21:18:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 237B4E08C4 for ; Sun, 5 Jan 2020 21:18:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19AF034DDDA for ; Sun, 5 Jan 2020 21:18:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB18EA5 for ; Sun, 5 Jan 2020 21:18:29 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1578257837.a6efe051a610e0ce6aa7eb36a40dfceba7065940.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a6efe051a610e0ce6aa7eb36a40dfceba7065940 X-VCS-Branch: master Date: Sun, 5 Jan 2020 21:18:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e4832f84-8e4f-469d-9b4c-5cc06ac71cad X-Archives-Hash: f9599118a7d78a99c559a8b7db386c8c commit: a6efe051a610e0ce6aa7eb36a40dfceba7065940 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jan 5 20:53:09 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jan 5 20:57:17 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6efe051 linuxrc: Don't call findfs multiple times "findfs" and "busybox findfs" is the same command. For $REAL_ROOT, this was already fixed via commit 9daa9b77165339495dd4cb35bd57237bd9ca9206. Signed-off-by: Thomas Deutschmann gentoo.org> defaults/linuxrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/defaults/linuxrc b/defaults/linuxrc index 50b99de..f585017 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -619,12 +619,6 @@ then retval=$? fi - if [ ${retval} -ne 0 ] - then - RESUME_DEV=$(busybox findfs "${REAL_RESUME}" 2>/dev/null) - retval=$? - fi - if [ ${retval} -ne 0 ] then RESUME_DEV=$(blkid -o device -l -t "${REAL_RESUME}" 2>/dev/null)