From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-351799-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QUL3R-0001SI-S6
for garchives@archives.gentoo.org; Wed, 08 Jun 2011 15:52:26 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1EA441C102;
Wed, 8 Jun 2011 15:52:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id E57681C102
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Jun 2011 15:52:08 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 61FB9654CD
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Jun 2011 15:52:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 7F0F18003C
for <gentoo-commits@lists.gentoo.org>; Wed, 8 Jun 2011 15:52:07 +0000 (UTC)
From: "Peter Hjalmarsson" <xake@rymdraket.net>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Peter Hjalmarsson" <xake@rymdraket.net>
Message-ID: <eec4397e4125a29119279c9296de8e310adc8599.xake@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: xake
X-VCS-Committer-Name: Peter Hjalmarsson
X-VCS-Revision: eec4397e4125a29119279c9296de8e310adc8599
Date: Wed, 8 Jun 2011 15:52:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: edbf39c53bd2b510c4642220244be930
commit: eec4397e4125a29119279c9296de8e310adc8599
Author: Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
AuthorDate: Wed Jun 8 15:49:23 2011 +0000
Commit: Peter Hjalmarsson <xake <AT> rymdraket <DOT> net>
CommitDate: Wed Jun 8 15:49:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git=
;a=3Dcommit;h=3Deec4397e
Check content of $REAL_ROOT/dev after we are done with it
Removes error message about missing /dev/console and /dev/null
---
defaults/linuxrc | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index ad6d780..57f26fd 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -725,13 +725,6 @@ fi
verbose_kmsg
=20
echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
-if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
-then
- echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing fil=
es required to boot (console and null)${NORMAL}"
-elif [ -e /etc/initrd.splash -a ! -e "${CHROOT}/dev/tty1" ]
-then
- echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing tty=
1, which is required for splash${NORMAL}"
-fi
=20
cd "${CHROOT}"
mkdir "${CHROOT}/proc" "${CHROOT}/sys" 2>/dev/null
@@ -750,6 +743,14 @@ do
fi
done
=20
+if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
+then
+ echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing fil=
es required to boot (console and null)${NORMAL}"
+elif [ -e /etc/initrd.splash -a ! -e "${CHROOT}/dev/tty1" ]
+then
+ echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your real /dev is missing tty=
1, which is required for splash${NORMAL}"
+fi
+
echo -e "${BOLD}.${NORMAL}"
=20
exec /sbin/switch_root -c "/dev/console" "${CHROOT}" "${REAL_INIT:-/sbin=
/init}" "${INIT_OPTS}"