From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 8 Sep 2005 20:59:07 +0000 (+0000)
Subject: Add code to dump grppkgs.txt file on livecd-stage1 and kernelpkgs.txt file on livecd... 
X-Git-Tag: CATALYST_2_0_6_916~659
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bf97b429e805fef239e334a380f14284f64863d7;p=catalyst.git

Add code to dump grppkgs.txt file on livecd-stage1 and kernelpkgs.txt file on livecd-stage2 and removing universal motd for livecd/type of gentoo-release-livecd.


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

diff --git a/ChangeLog b/ChangeLog
index 5a903d55..c96e071d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.327 2005/09/08 20:20:03 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.328 2005/09/08 20:59:07 wolf31o2 Exp $
+
+  08 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage1/livecd-stage1-controller.sh,
+  targets/support/kmerge.sh, targets/support/livecdfs-update.sh:
+  Add code to dump grppkgs.txt file on livecd-stage1 and kernelpkgs.txt file
+  on livecd-stage2 and removing universal motd for livecd/type of
+  gentoo-release-livecd.
 
   08 Sep 2005; Eric Edgar <rocket@gentoo.org>
   modules/livecd_stage1_target.py:
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index 8486328b..76420e45 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.8 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.9 2005/09/08 20:59:07 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -10,6 +10,12 @@ case $1 in
 	build_packages)
 		shift
 		export clst_packages="$*"
+		if [ "${clst_livecd_type}" = "gentoo-release-livecd" ]
+		then
+			mkdir -p ${clst_chroot_path}/usr/livecd
+			echo "${clst_packages}" > \
+				${clst_chroot_path}/usr/livecd/grppkgs.txt
+		fi
 		exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
 		;;
 
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 3764574b..52471501 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -77,6 +77,11 @@ genkernel_compile(){
 		then
 			genkernel --callback="emerge ${clst_kernel_merge}" \
 				${GK_ARGS} || exit 1
+			if [ "${clst_livecd_type}" = "gentoo-release-livecd" ]
+			then
+				mkdir -p /usr/livecd
+				echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt
+			fi
 		else
 			genkernel ${GK_ARGS} || exit 1
 		fi
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 18fd7c97..10e6ff6f 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.20 2005/08/09 19:02:31 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.21 2005/09/08 20:59:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 update_env_settings
@@ -135,7 +135,7 @@ case ${clst_livecd_type} in
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
 	;;
 	gentoo-release-livecd )
-		cat /etc/generic.motd.txt /etc/universal.motd.txt \
+		cat /etc/generic.motd.txt \
 			/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
 		sed -i 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' /etc/motd
 	;;