Gentoo Archives: gentoo-commits

From: "Andrew Gaffney (agaffney)" <agaffney@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] catalyst r1274 - in trunk: . modules targets/support
Date: Wed, 06 Feb 2008 16:05:21
Message-Id: E1JMmMn-00075j-Ed@stork.gentoo.org
1 Author: agaffney
2 Date: 2008-02-06 15:39:16 +0000 (Wed, 06 Feb 2008)
3 New Revision: 1274
4
5 Modified:
6 trunk/ChangeLog
7 trunk/modules/netboot2_target.py
8 trunk/targets/support/kmerge.sh
9 Log:
10 Add patch to enabled netboot2/linuxrc and automatically add path for initramfs overlay to genkernel commandline. Thanks to Justin Bronder <jsbronder@g.o> in bug 208106
11
12 Modified: trunk/ChangeLog
13 ===================================================================
14 --- trunk/ChangeLog 2008-02-06 00:37:33 UTC (rev 1273)
15 +++ trunk/ChangeLog 2008-02-06 15:39:16 UTC (rev 1274)
16 @@ -2,6 +2,12 @@
17 # $Id: $
18
19 06 Feb 2008; Andrew Gaffney <agaffney@g.o>
20 + modules/netboot2_target.py, targets/support/kmerge.sh:
21 + Add patch to enabled netboot2/linuxrc and automatically add path for
22 + initramfs overlay to genkernel commandline. Thanks to Justin Bronder
23 + <jsbronder@g.o> in bug 208106
24 +
25 + 06 Feb 2008; Andrew Gaffney <agaffney@g.o>
26 modules/netboot2_target.py:
27 Allow root_overlay in netboot2 target for bug 208106.
28
29
30 Modified: trunk/modules/netboot2_target.py
31 ===================================================================
32 --- trunk/modules/netboot2_target.py 2008-02-06 00:37:33 UTC (rev 1273)
33 +++ trunk/modules/netboot2_target.py 2008-02-06 15:39:16 UTC (rev 1274)
34 @@ -19,7 +19,8 @@
35 "netboot2/extra_files",
36 "netboot2/overlay",
37 "netboot2/busybox_config",
38 - "netboot2/root_overlay"
39 + "netboot2/root_overlay",
40 + "netboot2/linuxrc"
41 ])
42
43 try:
44
45 Modified: trunk/targets/support/kmerge.sh
46 ===================================================================
47 --- trunk/targets/support/kmerge.sh 2008-02-06 00:37:33 UTC (rev 1273)
48 +++ trunk/targets/support/kmerge.sh 2008-02-06 15:39:16 UTC (rev 1274)
49 @@ -48,6 +48,12 @@
50 then
51 GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
52 fi
53 +
54 + if [ "${clst_target}" == "netboot2" -a -n "${clst_merge_path}" ]
55 + then
56 + GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
57 + fi
58 +
59 }
60
61 genkernel_compile(){
62
63 --
64 gentoo-commits@l.g.o mailing list