From 820380832f6d21a9f7c227455df60e07410d3c23 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 6 Oct 2008 00:07:39 +0200 Subject: [PATCH 1/1] Rework config_swspeak once more, move code to script 'swspeak' --- autoconfig.functions | 20 ++------------------ debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index 7af72a2..0084161 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -826,7 +826,7 @@ config_swspeak(){ if checkbootparam swspeak ; then einfo "Bootoption swspeak found." - if [ ! -d /proc/speakup/ ] && ! grep -q speakup /proc/modules ; then + if [ ! -d /proc/speakup/ ] && ! grep -q speakup_soft /proc/modules ; then ewarn "Kernel does not support software speakup - trying to load kernel module:" ; eend 0 eindent einfo "Loading speakup_soft" @@ -840,27 +840,11 @@ config_swspeak(){ eoutdent fi - if [ -d /proc/speakup/ ] || grep -q speakup /proc/modules ; then + if [ -d /proc/speakup/ ] || grep -q speakup_soft /proc/modules ; then einfo "Kernel supports speakup." ; eend 0 eindent - if [ -x /etc/init.d/speech-dispatcher ] ; then - einfo "Starting speech-dispatcher." - /etc/init.d/speech-dispatcher start 1>>DEBUG ; eend $? - if [ -r /proc/speakup/synth_name ] ; then - einfo "Activating sftsyn via /proc in Kernel." - echo sftsyn > /proc/speakup/synth_name ; eend $? - elif [ -r /sys/modules/speakup/parameters/synth ] ; then - einfo "Activating sftsyn via /sys in Kernel." - echo sftsyn > /sys/modules/speakup/parameters/synth ; eend $? - else - eerror "Error when configuring sftsyn via /proc or /sys." ; eend 1 - fi einfo "Just run swspeak if you want to use software synthesizer via speakup." flitewrapper "Finished activating software speakup. Just run swspeak when booting finished." - else - eerror "speech-dispatcher not available. swspeak will not work without it." ; eend 1 - flitewrapper "speech-dispatcher not available. speakup will not work without it." - fi eoutdent else eerror "Kernel does not seem to support speakup. Skipping swspeak." ; eend 1 diff --git a/debian/changelog b/debian/changelog index ffbff75..59ffc83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-autoconfig (0.8.14) unstable; urgency=low + + * Rework config_swspeak once more, move most parts of the logic + into an external script named 'swspeak' which will be shipped + with grml-scripts. + + -- Michael Prokop Mon, 06 Oct 2008 00:05:51 +0200 + grml-autoconfig (0.8.13) unstable; urgency=low * Use random password if bootoption 'ssh' doesn't have an option. -- 2.1.4