From: Chris Gianelloni Date: Fri, 19 Nov 2004 18:19:23 +0000 (+0000) Subject: Fixing up some GameCD stuff and also fixing a problem with the ls and grep aliases... X-Git-Tag: CATALYST_2_0_6_916~890 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20920bbb2ebec06c0c18a9575360edfcf3523856;p=catalyst.git Fixing up some GameCD stuff and also fixing a problem with the ls and grep aliases having --color rather than --color=auto. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@483 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index e13ce375..a973a0fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.112 2004/11/18 01:54:45 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.113 2004/11/19 18:19:23 wolf31o2 Exp $ + + 19 Nov 2004; Chris Gianelloni + livecd/files/gamecd-xinitrc, livecd/runscript-support/gamecdfs-update.sh, + livecd/runscript-support/livecdfs-update.sh: + Fixing up some GameCD stuff and also fixing a problem with the ls and grep + aliases having --color rather than --color=auto. 17 Nov 2004; Chris Gianelloni livecd/files/livecd-local.start: diff --git a/livecd/files/gamecd-xinitrc b/livecd/files/gamecd-xinitrc index 1303131c..92c0814d 100644 --- a/livecd/files/gamecd-xinitrc +++ b/livecd/files/gamecd-xinitrc @@ -1,2 +1,2 @@ -GAME_EXECUTABLE & +##GAME_EXECUTABLE & exec fluxbox diff --git a/livecd/runscript-support/gamecdfs-update.sh b/livecd/runscript-support/gamecdfs-update.sh index 9bf11015..b88744df 100644 --- a/livecd/runscript-support/gamecdfs-update.sh +++ b/livecd/runscript-support/gamecdfs-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/livecd/runscript-support/Attic/gamecdfs-update.sh,v 1.4 2004/11/15 01:32:15 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/gamecdfs-update.sh,v 1.5 2004/11/19 18:19:23 wolf31o2 Exp $ # These variables are to be used for creating the menu entry and also to tell # the CD what to execute @@ -9,11 +9,11 @@ GAME_NAME="Unreal Tournament 2004 Demo" GAME_SHORT_NAME="UT2004 Demo" GAME_EXECUTABLE="/usr/games/bin/ut2004demo" -sed -i -e "s:localhost:livecd.gentoo localhost:" /etc/hosts +sed -i -e "s:localhost:gamecd.gentoo localhost:" /etc/hosts sed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd -sed -i -e "s:GAME_EXECUTABLE:${GAME_EXECUTABLE}:" /etc/X11/xinit/xinitrc +sed -i -e "s:##GAME_EXECUTABLE:${GAME_EXECUTABLE}:" /etc/X11/xinit/xinitrc -[ -x /sbin/openglify ] && /sbin/openglify +[ -x /usr/sbin/openglify ] && /usr/sbin/openglify touch /etc/asound.state /etc/startx cat > /usr/share/fluxbox/menu << EOF diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh index ae481f7a..d5b51d19 100755 --- a/livecd/runscript-support/livecdfs-update.sh +++ b/livecd/runscript-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/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.20 2004/11/07 13:51:55 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.21 2004/11/19 18:19:23 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -55,6 +55,7 @@ rm -rf /etc/localtime cp /usr/share/zoneinfo/GMT /etc/localtime echo "livecd" > /etc/hostname echo "gentoo" > /etc/dnsdomainname +sed -i -e "s:localhost:livecd.gentoo localhost:" /etc/hosts # gpm fixes sed -i -e 's/#MOUSE=imps2/MOUSE=imps2/' \ @@ -78,11 +79,10 @@ cat /etc/fstab.old >> /etc/fstab rm /etc/fstab.old echo "alias cp='cp -i'" >> /etc/profile -echo "alias ls='ls --color'" >> /etc/profile echo "alias mv='mv -i'" >> /etc/profile -echo "alias pico='nano -w'" >> /etc/profile echo "alias rm='rm -i'" >> /etc/profile -echo "alias grep='grep --color'" >> /etc/profile +echo "alias ls='ls --color=auto'" >> /etc/profile +echo "alias grep='grep --color=auto'" >> /etc/profile # make sure we have the latest pci and hotplug ids if [ -d /usr/share/hwdata ]