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 3FAC8138334 for ; Mon, 7 Oct 2019 21:56:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78334E08EB; Mon, 7 Oct 2019 21:56:49 +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 59B05E08EF for ; Mon, 7 Oct 2019 21:56:49 +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 EF74A34BA12 for ; Mon, 7 Oct 2019 21:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE0AF82D for ; Mon, 7 Oct 2019 21:56:45 +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: <1570485026.f60871ba99fac8e48b03d533a341a6e26ec398e3.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: f60871ba99fac8e48b03d533a341a6e26ec398e3 X-VCS-Branch: master Date: Mon, 7 Oct 2019 21:56:45 +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: e20acc63-058b-4f7b-8c60-d365d8d727d5 X-Archives-Hash: a332d00edd83a2b52bc3d5bf083ba3fc commit: f60871ba99fac8e48b03d533a341a6e26ec398e3 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Oct 7 21:02:47 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Oct 7 21:50:26 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f60871ba linuxrc: Update REAL_INIT variable when using fallback When we detected that mounted root device doesn't contain a valid init program (i.e. set init value isn't an executable file), we didn't update REAL_INIT value with fallback value with the result that we called switch_root with an invalid init parameter. Signed-off-by: Thomas Deutschmann gentoo.org> defaults/linuxrc | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults/linuxrc b/defaults/linuxrc index 852992d..83ef89f 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -882,6 +882,7 @@ do if [ -f "${init_binary_fallback_file}" -a -x "${init_binary_fallback_file}" ] then + REAL_INIT="${init_binary_fallback_file/${NEW_ROOT}}" good_msg "Executable fallback file '${init_binary_fallback_file}' detected!" ${QUIET} break else