From 95fb84aa227164d274d97b5c2b48cd3fb27cfb77 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 6 Apr 2005 14:07:11 +0000 Subject: [PATCH] Merging in changes from catalyst 1.1.x for gamecd support. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@587 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 10 ++++++++-- targets/livecd-stage1/livecd-stage1-controller.sh | 10 +++++++++- targets/support/gamecdfs-update.sh | 2 +- targets/support/livecdfs-update.sh | 9 +++++---- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d27b9df1..ce183c3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.207 2005/04/06 03:02:06 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.208 2005/04/06 14:07:11 wolf31o2 Exp $ + + 06 Apr 2005; Chris Gianelloni + targets/livecd-stage1/livecd-stage1-controller.sh, + targets/support/gamecdfs-update.sh, targets/support/livecdfs-update.sh: + Merging in changes from catalyst 1.1.x for gamecd support. 06 Apr 2005; Eric Edgar targets/stage1/stage1-preclean-chroot.sh: - Removing gcc-config stuff to see if its still required to work around a gcc bug + Removing gcc-config stuff to see if its still required to work around a gcc + bug 06 Apr 2005; Eric Edgar targets/support/chroot-functions.sh, targets/support/kmerge.sh: diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh index c729a517..0eed99a0 100755 --- a/targets/livecd-stage1/livecd-stage1-controller.sh +++ b/targets/livecd-stage1/livecd-stage1-controller.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.1 2005/04/04 17:48:33 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.2 2005/04/06 14:07:11 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh @@ -52,7 +52,15 @@ case $1 in # execute gamecdfs-update.sh if we're a gamecd if [ "${clst_livecd_type}" = "gentoo-gamecd" ] then + if [ -n "${clst_gamecd_conf}" ] + then + cp ${clst_gamecd_conf} ${clst_chroot_path}/tmp/gamecd.conf + else + echo "gamecd/conf is required for a gamecd!" + exit 1 + fi exec_in_chroot ${clst_sharedir}/targets/support/gamecdfs-update.sh + rm -f ${clst_chroot_path}/tmp/gamecd.conf fi # if the user has their own fs update script, execute it diff --git a/targets/support/gamecdfs-update.sh b/targets/support/gamecdfs-update.sh index 69281201..df96cabf 100755 --- a/targets/support/gamecdfs-update.sh +++ b/targets/support/gamecdfs-update.sh @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # we grab our configuration -source "${clst_gamecd_conf}" || exit 1 +source /tmp/gamecd.conf || exit 1 # here we replace out game information into several files sed -i -e "s:livecd:gamecd:" /etc/hosts diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 16cebe00..b8c98e88 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 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.2 2005/04/05 21:43:09 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.3 2005/04/06 14:07:11 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -130,10 +130,11 @@ then fi # setup opengl in /etc (if configured) -[ -x /usr/sbin/openglify ] && /usr/sbin/openglify +#[ -x /usr/sbin/openglify ] && /usr/sbin/openglify +mkdir -p /etc/opengl -# touch /etc/asound.state if alsa is configured -[ -d /proc/asound/card0 ] && touch /etc/asound.state +# touch /etc/asound.state +touch /etc/asound.state # tweak the motd for gentoo releases if [ "${clst_livecd_type}" = "gentoo-release-universal" ] -- 2.26.2