From 0e50eaebc35444ea418b0c9b6ffeb2c242d205c7 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 18 Nov 2004 01:05:52 +0000 Subject: [PATCH] Fixing up livecd/files/livecd-local.start to remove ALSA config and make x-setup check for /etc/startx. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@481 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- livecd/files/livecd-local.start | 17 +---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4220f9f8..6a2e29d1 100644 --- 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 + 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 livecd/runscript-support/gamecdfs-update.sh: diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start index e391ac00..a1d9e457 100644 --- 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 -- 2.26.2