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 ba92609cb3acd4867e7b3f9e096a67c92bb605af..8c8aa21496b6eb4fb929479bf0438ec9d484dc1d 100644 (file)
--- 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 cf8be07dde4b53126faea250979ad0d10c388d06..06418bd22037eb7dfdf59b08def582160d087443 100755 (executable)
--- 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 7eb56b23c1180845c6385a82eb2fa388d892d51f..9c982421c0146cd853f45130ab8ceed70fdf0f2a 100755 (executable)
--- 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