summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2009-06-28 18:52:01 -0500
committerAndrew Gaffney <agaffney@gentoo.org>2009-06-28 18:52:01 -0500
commitaabf2007d9cf801aacb466d8532eca3bd86219cd (patch)
tree4e3bbce518fbc256a3255d5ef54171cf72d908d4
parentApply patch from jer for gentoo bug #249155 (diff)
downloadlivecd-tools-aabf2007d9cf801aacb466d8532eca3bd86219cd.tar.gz
livecd-tools-aabf2007d9cf801aacb466d8532eca3bd86219cd.tar.bz2
livecd-tools-aabf2007d9cf801aacb466d8532eca3bd86219cd.zip
Apply patch for speakup support from gentoo bug #267708
-rw-r--r--ChangeLog5
-rwxr-xr-xautoconfig31
2 files changed, 35 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c2bc90..b264814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni
+# Copyright 1999-2009 Gentoo Foundation; 2008 Chris Gianelloni
# Distributed under the GPL v2.1
+ 28 Jun 2009; Andrew Gaffney <agaffney@gentoo.org> autoconfig:
+ Apply patch for speakup support from gentoo bug #267708
+
28 Nov 2008; Andrew Gaffney <agaffney@gentoo.org> autoconfig:
Apply patch from jer for gentoo bug #249155
diff --git a/autoconfig b/autoconfig
index 65708c7..89c0e9a 100755
--- a/autoconfig
+++ b/autoconfig
@@ -25,6 +25,9 @@ PATA="yes"
PCMCIA="yes"
SATA="yes"
SCSI="no"
+SPEAKUP="no"
+SPEAKUP_MODULE=""
+SPEAKUP_OPTIONS=""
SSHD="no"
USB="yes"
X11="yes"
@@ -123,6 +126,7 @@ get_config() {
;;
brltty=*)
BRLTTY="yes"
+ X11="no"
;;
ide\=nodma)
IDEDMA="no"
@@ -186,6 +190,14 @@ get_config() {
PASSWD="no"
PASSWORD="${x#*=}"
;;
+ speakup.synth=*)
+ SPEAKUP="yes"
+ SPEAKUP_MODULE="speakup_${x#*=}"
+ X11="no"
+ ;;
+ speakup_*.{ser,port}=*)
+ SPEAKUP_OPTIONS="${SPEAKUP_OPTIONS} ${x#*.}"
+ ;;
esac
done
}
@@ -364,6 +376,11 @@ start() {
[ -x /etc/init.d/brltty ] && /etc/init.d/brltty start
fi
+ if [ "${SPEAKUP}" = "yes" ]
+ then
+ modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS}
+ fi
+
if [ "${DETECT}" = "yes" ]
then
ebegin "Hardware detection started"
@@ -589,6 +606,15 @@ start() {
[ -n "$(grep Master /etc/amixer)" ] \
&& amixer -c $i -q set Master 95% unmute \
>/dev/null 2>&1
+ [ -n "$(grep Front /etc/amixer)" ] \
+ && amixer -c $i -q set Front 95% unmute \
+ >/dev/null 2>&1
+ [ -n "$(grep HDMI /etc/amixer)" ] \
+ && amixer -c $i -q set HDMI 95% unmute \
+ >/dev/null 2>&1
+ [ -n "$(grep IEC958 /etc/amixer)" ] \
+ && amixer -c $i -q set IEC958 95% unmute \
+ >/dev/null 2>&1
[ -n "$(grep PCM /etc/amixer)" ] \
&& amixer -c $i -q set PCM 95% unmute \
>/dev/null 2>&1
@@ -603,6 +629,11 @@ start() {
>/dev/null 2>&1
fi
done
+
+ if [ "${SPEAKUP_MODULE}" = "speakup_soft" ]
+ then
+ [ -x /etc/init.d/espeakup ] && /etc/init.d/espeakup start
+ fi
fi
fi
else