Disable copying of nb-busybox.cf since it isn't used anyway

diff --git a/ChangeLog b/ChangeLog
index d5aca85bd7f32b5b09a0c7f73c15bdebc5e5a352..102eae32bbca087d155dedd225b3ad41844b3c8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  12 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/netboot2/netboot2-controller.sh:
+  Disable copying of nb-busybox.cf since it isn't used anyway
+
   07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> arch/amd64.py,
   arch/x86.py, catalyst:
   A few typo and other minor fixes as reported by armin76

diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index c5ee152a7b1b13114987ed6010db6ffd811d1e17..b46719cbbebbb682832085b6d918cee050778368 100644 (file)
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -14,11 +14,9 @@ case ${1} in
        ;;
        pre-kmerge)
                # Sets up the build environment before any kernels are compiled
-               if [ -z "${clst_netboot2_busybox_config}" ]; then
-                       cp ${clst_sharedir}/targets/netboot2/nb-busybox.cf ${clst_chroot_path}/tmp/busy-config
-               else
-                       cp ${clst_netboot2_busybox_config} ${clst_chroot_path}/tmp/busy-config
-               fi
+#              if [ -n "${clst_netboot2_busybox_config}" ]; then
+#                      cp ${clst_netboot2_busybox_config} ${clst_chroot_path}/tmp/busy-config
+#              fi
                exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
        ;;
        post-kmerge)