Added a small debug statement to generic/linuxrc so we know when we're hitting the...

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

diff --git a/ChangeLog b/ChangeLog
index 983b088f9b3c9634eee27bc6eed974eaad5c3961..2f3290eebce28c79c4633cc43a236f40ab759f00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,11 +2,16 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> generic/linuxrc,
+  genkernel:
+  Added a small debug statement to generic/linuxrc so we know when we're
+  hitting the initrd code path. This is genkernel 3.4.10_pre5 for testing.
+
   12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
   Change to new temp directory so the firmware gets copied to the right place
 
   12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
-  Copy with -L so we get the file instead of the symlink
+  Copy firmware file with -L so we get the file instead of the symlink
 
   12 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh:
   Fix another quoting malfunction

diff --git a/generic/linuxrc b/generic/linuxrc
index 6b4d4d5fd6c97912ae57908571e1cb1397a8d2bd..13d85340ea9d059c81f7b98b1bcc4704f020959a 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -601,6 +601,8 @@ verbose_kmsg
 
 if [ "$0" = '/linuxrc' ] || [ "$0" = 'linuxrc' ]
 then
+       # XXX: remove me!!!
+       echo "DEBUG: initrd code path"
        if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ] \
        || [ ! -e "${CHROOT}/dev/tty1" ]
        then

diff --git a/genkernel b/genkernel
index 31eccbf181fe4ebf7f8ad3537c57c61c182b52d9..5d75a0bffd02aed65f456e5acb5ca488430c436c 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.10_pre4'
+GK_V='3.4.10_pre5'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -30,6 +30,7 @@ case "$*" in
        ;;
 esac
 
+# Pull in our configuration
 source ${CMD_GK_CONFIG:-/etc/genkernel.conf} || small_die "Could not read /etc/genkernel.conf"
 
 # Start sourcing other scripts