From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 54AE3138010 for ; Wed, 3 Oct 2012 16:24:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EE3EE01F1; Wed, 3 Oct 2012 16:24:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 29ABFE01F1 for ; Wed, 3 Oct 2012 16:24:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 635F833D731 for ; Wed, 3 Oct 2012 16:24:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D44B6E5436 for ; Wed, 3 Oct 2012 16:24:00 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1349281269.d89f3d59e8e0ee31b228d28888b302031838a672.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: /, defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog defaults/linuxrc X-VCS-Directories: / defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: d89f3d59e8e0ee31b228d28888b302031838a672 X-VCS-Branch: master Date: Wed, 3 Oct 2012 16:24:00 +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-Archives-Salt: 9906534b-1856-4b6f-86bf-84105f43b62d X-Archives-Hash: 149f0f9331ea59050156bb1f689b6117 commit: d89f3d59e8e0ee31b228d28888b302031838a672 Author: Dustin Frisch gmail com> AuthorDate: Wed Oct 3 16:20:16 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Wed Oct 3 16:21:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=d89f3d59 Check for file from real_init=FILE rather than /sbin/init (bug #437080) --- ChangeLog | 4 ++++ defaults/linuxrc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47a81ea..d453080 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 03 Oct 2012; Dustin Frisch defaults/linuxrc: + With boot parameter real_init=/foo look for ${NEW_ROOT}/foo, not + ${NEW_ROOT}/sbin/init (bug #437080) + 23 Sep 2012; Sebastian Pipping gen_initramfs.sh: Append e2fsck and mke2fs to initramfs. Original patch by Rick Farina diff --git a/defaults/linuxrc b/defaults/linuxrc index 4a12c21..d6766b8 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -623,7 +623,7 @@ do # else not a good root and start over. if [ "$?" = '0' ] then - if [ -d ${NEW_ROOT}/dev -a -x ${NEW_ROOT}/sbin/init ] || [ "${REAL_ROOT}" = "/dev/nfs" ] + if [ -d ${NEW_ROOT}/dev -a -x "${NEW_ROOT}${REAL_INIT:-/sbin/init}" ] || [ "${REAL_ROOT}" = "/dev/nfs" ] then break else