From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Mon, 12 Mar 2007 13:12:54 +0000 (+0000)
Subject: Removed the generation of grppkgs.txt since the Installer now uses vdb directly.
X-Git-Tag: CATALYST_2_0_6_916~271
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=db2e87f037d2c42b5ddb54102c1e7ba30d7010c7;p=catalyst.git

Removed the generation of grppkgs.txt since the Installer now uses vdb directly.

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

diff --git a/ChangeLog b/ChangeLog
index ba92609c..8c8aa214 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  12 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage1/livecd-stage1-controller.sh,
+  targets/support/livecdfs-update.sh:
+  Removed the generation of grppkgs.txt since the Installer now uses vdb
+  directly.
+
   09 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/create-iso.sh:
   Fix creation of the EFI images. Since it is FAT, we can't go around
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index cf8be07d..06418bd2 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -8,7 +8,6 @@ case $1 in
 		shift
 		export clst_packages="$*"
 		mkdir -p ${clst_chroot_path}/usr/livecd
-		echo "${clst_packages}" > ${clst_chroot_path}/usr/livecd/grppkgs.txt
 		exec_in_chroot \
 			${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
 		;;
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 7eb56b23..9c982421 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -384,10 +384,6 @@ case ${clst_livecd_type} in
 		# This is my hack to reduce tmpfs usage
 		mkdir -p /usr/livecd
 		[ -d /etc/gconf ] && mv -f /etc/gconf /usr/livecd
-		if [ -e /usr/livecd/grppkgs.txt ]
-		then
-			rm -f /usr/livecd/grppkgs.txt
-		fi
 		if [ -e /usr/livecd/kernelpkgs.txt ]
 		then
 			rm -f /usr/livecd/kernelpkgs.txt
@@ -396,10 +392,6 @@ case ${clst_livecd_type} in
 		touch /etc/startx
 		;;
 	* )
-		if [ -e /usr/livecd/grppkgs.txt ]
-		then
-			rm -f /usr/livecd/grppkgs.txt
-		fi
 		if [ -e /usr/livecd/kernelpkgs.txt ]
 		then
 			rm -f /usr/livecd/kernelpkgs.txt