From df66712eaedc1b56e07b352d59b6ed603a8fd470 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Wed, 6 Feb 2008 15:39:16 +0000 Subject: [PATCH] Add patch to enabled netboot2/linuxrc and automatically add path for initramfs overlay to genkernel commandline. Thanks to Justin Bronder in bug 208106 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1274 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ modules/netboot2_target.py | 3 ++- targets/support/kmerge.sh | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70444636..0f5ac4d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Feb 2008; Andrew Gaffney + modules/netboot2_target.py, targets/support/kmerge.sh: + Add patch to enabled netboot2/linuxrc and automatically add path for + initramfs overlay to genkernel commandline. Thanks to Justin Bronder + in bug 208106 + 06 Feb 2008; Andrew Gaffney modules/netboot2_target.py: Allow root_overlay in netboot2 target for bug 208106. diff --git a/modules/netboot2_target.py b/modules/netboot2_target.py index f8fc6b04..444f873c 100644 --- a/modules/netboot2_target.py +++ b/modules/netboot2_target.py @@ -19,7 +19,8 @@ class netboot2_target(generic_stage_target): "netboot2/extra_files", "netboot2/overlay", "netboot2/busybox_config", - "netboot2/root_overlay" + "netboot2/root_overlay", + "netboot2/linuxrc" ]) try: diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 74daffff..5cdd418c 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -48,6 +48,12 @@ setup_gk_args() { then GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc" fi + + if [ "${clst_target}" == "netboot2" -a -n "${clst_merge_path}" ] + then + GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\"" + fi + } genkernel_compile(){ -- 2.26.2