Split up /dev node checks into console/null and tty1

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@662 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index d266c910bcfa1a1078bcae90c48e2855cb77879a..26bdc53523844c1f0149bd028b8cb7c2dfb2bfb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
+  Split up /dev node checks into console/null and tty1
+
   02 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
   Remove initrd-specific code from linuxrc
 

diff --git a/generic/linuxrc b/generic/linuxrc
index 40de1609ac72342a4cc4f2791cd5f724575d7c3d..226f4c662c4d5bd4ee162bc80c90ebfb123bd13d 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -607,12 +607,13 @@ fi
 verbose_kmsg
 
 # There used to be some initrd/2.4 code here, but it's gone now :
-if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ] \
-|| [ ! -e "${CHROOT}/dev/tty1" ]
+echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
+if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
 then
-       echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: /dev is broken!${NORMAL}"
-else
-       echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"
+       echo -ne "${BAD}>>${NORMAL}${BOLD} ERROR: your /dev is missing files 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 /dev is missing tty1, which is required for splash${NORMAL}"
 fi
 
 cd "${CHROOT}"