Fixing up livecd/files/livecd-local.start to remove ALSA config and make x-setup...

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

diff --git a/ChangeLog b/ChangeLog
index 4220f9f87c1979b52b78b5efba428fbebd73a915..6a2e29d12378d9b1512e843a5c2c77e1e99e5a74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.110 2004/11/15 01:32:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.111 2004/11/18 01:05:52 wolf31o2 Exp $
+
+  17 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/livecd-local.start:
+  Fixing up livecd/files/livecd-local.start to remove ALSA config and make
+  x-setup check for /etc/startx.
 
   14 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript-support/gamecdfs-update.sh:

diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start
index e391ac00efa3365f058ccda89df5d693003ffdfa..a1d9e457f2e4d691eed04f055c60e201c86c325e 100644 (file)
--- a/livecd/files/livecd-local.start
+++ b/livecd/files/livecd-local.start
@@ -3,19 +3,4 @@
 # This is a good place to load any misc.
 # programs on startup ( 1>&2 )
 
-[ -x /sbin/x-setup ] && /sbin/x-setup
-
-# Experimental ALSA stuff
-if [ -d /proc/asound/card0 ] && [ -x /usr/bin/amixer ]; then
-       amixer scontrols > /etc/amixer
-       [ -n "`grep Master /etc/amixer`" ] && amixer set Master 75% \
-               && amixer set Master unmute
-       [ -n "`grep PCM /etc/amixer`" ] && amixer set PCM 75% \
-               && amixer set PCM unmute
-       [ -n "`grep Mic /etc/amixer`" ] && amixer set Mic 75% \
-               && amixer set Mic cap
-       [ -n "`grep Wave /etc/amixer`" ] && amixer set Wave 75% \
-               && amixer set Wave unmute
-       [ -n "`grep Capture /etc/amixer`" ] && amixer set Capture 75% \
-               && amixer set Capture cap && amixer set Capture unmute
-fi
+[ -e /etc/startx ] && [ -x /usr/sbin/x-setup ] && /sbin/x-setup