From 583d25030b7fd1aa75ec4c5a3d593accf2864c22 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 12 Mar 2008 22:42:24 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@628 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 7 ++++++- generic/linuxrc | 2 ++ genkernel | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 983b088..2f3290e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,11 +2,16 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Mar 2008; Chris Gianelloni 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 gen_initramfs.sh: Change to new temp directory so the firmware gets copied to the right place 12 Mar 2008; Andrew Gaffney 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 gen_initramfs.sh: Fix another quoting malfunction diff --git a/generic/linuxrc b/generic/linuxrc index 6b4d4d5..13d8534 100644 --- 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 31eccbf..5d75a0b 100755 --- 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 -- 2.26.2