From: Eric Edgar Date: Thu, 28 Jul 2005 15:57:37 +0000 (+0000) Subject: Fix cp /dev/tty1 error message X-Git-Tag: v3.4.10.902~469 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d02b87e6984919acb8d1b33347f0cae823291816;p=genkernel.git Fix cp /dev/tty1 error message git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@283 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/gen_initrd.sh b/gen_initrd.sh index 3558be9..402035f 100644 --- a/gen_initrd.sh +++ b/gen_initrd.sh @@ -56,7 +56,7 @@ create_base_initrd_sys() { cd ${TEMP}/initrd-temp/dev MAKEDEV std MAKEDEV console - + if [ "${DISKLABEL}" -eq '1' ]; then cp "${BLKID_BINCACHE}" "${TEMP}/initrd-temp/bin/blkid.bz2" || gen_die 'Could not copy blkid from bincache!' diff --git a/generic/linuxrc b/generic/linuxrc index a0b59af..ceaac22 100644 --- a/generic/linuxrc +++ b/generic/linuxrc @@ -236,7 +236,13 @@ then done cp /dev/null ${NEW_ROOT}/dev cp /dev/console ${NEW_ROOT}/dev - cp /dev/tty1 ${NEW_ROOT}/dev + + # Required for gensplash to work. Not an issue with the initrd as this device isnt created there and is not needed. + if [ -e /dev/tty1 ] + then + cp /dev/tty1 ${NEW_ROOT}/dev + fi + sdelay [ "${REAL_ROOT}" = "/dev/nfs" ] || bootstrapCD