Add patch to enabled netboot2/linuxrc and automatically add path for initramfs overla...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1274 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 704446363fe3aa7d8be13cb6ac4aea2da0c57338..0f5ac4d2a8656c531de6032e473aa33c4bdeac24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
+  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
+  <jsbronder@gentoo.org> in bug 208106
+
   06 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   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 f8fc6b0402fe908e9cf0d642594ef1d550528b51..444f873c098324e71c4b69934e0e2562bbf4465d 100644 (file)
--- 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 74daffff641afd32aaf1077343d9ad7308b7915a..5cdd418c3b4b1e300f88ad2b520aeb36a5e1f271 100755 (executable)
--- 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(){