Remove a bit of unnecessary code

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

diff --git a/ChangeLog b/ChangeLog
index e9459ba32e8b170df27704805e7dd26d60634a2f..4f499c66e01dc60cea9c9825fcf6cd48b4e44f22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/netboot2/netboot2-pkg.sh:
+  Remove a bit of unnecessary code
+
   10 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py, targets/grp/grp-chroot.sh,
   targets/support/chroot-functions.sh:

diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
index 88c32e88fb6cdefcb9d213fc9377caa36c2046ac..29da713411879da1218ca3347e17f0cc8fe968b5 100644 (file)
--- a/targets/netboot2/netboot2-pkg.sh
+++ b/targets/netboot2/netboot2-pkg.sh
@@ -8,9 +8,6 @@ setup_myfeatures
 
 show_debug
 
-# Setup our environment
-export FEATURES="${clst_myfeatures}"
-
 # START BUILD
 
-run_merge ${clst_myemergeopts} ${clst_packages}
+run_merge ${clst_packages}