Remove unmaintained accessibility support

diff --git a/autoconfig b/autoconfig
index b4c48a4..45da179 100644 (file)
--- a/autoconfig
+++ b/autoconfig
@@ -51,8 +51,6 @@ CONFIG_915RESOLUTION='yes'    # run 915resolution with specified options for adj
 CONFIG_AGP='yes'              # check for bootparam forceagp
 CONFIG_AUTOMOUNT='yes'        # automounting of device labeled GRMLCFG
 CONFIG_BLANKING='yes'         # check for bootoption noblank to disable console blanking
 CONFIG_AGP='yes'              # check for bootparam forceagp
 CONFIG_AUTOMOUNT='yes'        # automounting of device labeled GRMLCFG
 CONFIG_BLANKING='yes'         # check for bootoption noblank to disable console blanking

-CONFIG_BLINDSOUND='yes'       # play 'beep' and play welcome message
-CONFIG_BLIND='yes'            # check for blind option or brltty

 CONFIG_CONFIG='yes'           # do we want config unpacking to work?
 CONFIG_CONSOLE='yes'          # activate mgetty when using console=... as bootparam
 CONFIG_DEBOOTSTRAP='yes'      # support automatic installation of Debian via grml-deboostrap
 CONFIG_CONFIG='yes'           # do we want config unpacking to work?
 CONFIG_CONSOLE='yes'          # activate mgetty when using console=... as bootparam
 CONFIG_DEBOOTSTRAP='yes'      # support automatic installation of Debian via grml-deboostrap


@@ -72,7 +70,6 @@ CONFIG_FWTIMEOUT='yes'        # set timeout for firmware loading
 CONFIG_GRML2HD='yes'          # check for 'grml2hd' bootoption
 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
 CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from CD
 CONFIG_GRML2HD='yes'          # check for 'grml2hd' bootoption
 CONFIG_HOMEDIR='yes'          # check for persistent homedir option
 CONFIG_HOSTNAME='yes'         # set hostname to 'grml' on systems running from CD

-CONFIG_HWSPEAK='yes'          # support for hardware synthesizer via speakup

 CONFIG_KERNEL='yes'           # display information on running kernel
 CONFIG_LANGUAGE='yes'         # allow language specification via commandline
 CONFIG_LD_MOD='yes'           # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing
 CONFIG_KERNEL='yes'           # display information on running kernel
 CONFIG_LANGUAGE='yes'         # allow language specification via commandline
 CONFIG_LD_MOD='yes'           # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing


@@ -95,7 +92,6 @@ CONFIG_SERVICES='yes'         # check for services to run, provided via bootpara
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM
 CONFIG_SSH='yes'              # check for bootparam ssh
 CONFIG_SWRAID='yes'           # check for software raid devices [only in live-mode]
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM
 CONFIG_SSH='yes'              # check for bootparam ssh
 CONFIG_SWRAID='yes'           # check for software raid devices [only in live-mode]

-CONFIG_SWSPEAK='yes'          # run software synthesizer via speakup

 CONFIG_TESTCD='yes'           # CD checker
 CONFIG_TIME='yes'             # set clock, check for bootparam utc/gmt [only in live-mode]
 CONFIG_TIMEZONE='yes'         # get bootparam 'tz' and set it as /etc/localtime [only in live-mode]
 CONFIG_TESTCD='yes'           # CD checker
 CONFIG_TIME='yes'             # set clock, check for bootparam utc/gmt [only in live-mode]
 CONFIG_TIMEZONE='yes'         # get bootparam 'tz' and set it as /etc/localtime [only in live-mode]

diff --git a/autoconfig.functions b/autoconfig.functions
index 3d5410e..a9c5043 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -98,10 +98,6 @@ checkgrmlsmall(){
   grep -q small /etc/grml_version 2>>$DEBUG && return 0 || return 1
 }
 
   grep -q small /etc/grml_version 2>>$DEBUG && return 0 || return 1
 }
 

-# execute flite only if it's present
-flitewrapper() {
-   [ -x /usr/bin/flite ] && flite -o play -t "$*"
-}

 ### }}}
 
 # {{{ filesystems (proc, pts, sys) and fixes
 ### }}}
 
 # {{{ filesystems (proc, pts, sys) and fixes


@@ -754,139 +750,6 @@ fi
 }
 # }}}
 
 }
 # }}}
 

-# {{{ run software synthesizer via speakup
-config_swspeak(){
-   if checkbootparam 'swspeak' ; then
-      einfo "Bootoption swspeak found."
-
-      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"
-         if modprobe speakup_soft ; then
-            eend 0
-         else
-            flitewrapper "Fatal error setting up software speakup"
-            eend 1
-            return 1
-         fi
-         eoutdent
-      fi
-
-      if [ -d /proc/speakup/ ] || grep -q speakup_soft /proc/modules ; then
-         einfo "Kernel supports speakup." ; eend 0
-         eindent
-            einfo "Just run swspeak if you want to use software synthesizer via speakup."
-            flitewrapper "Finished activating software speakup. Just run swspeak when booting finished."
-         eoutdent
-      else
-         eerror "Kernel does not seem to support speakup. Skipping swspeak." ; eend 1
-         flitewrapper "Kernel does not seem to support speakup. Sorry."
-      fi
-   fi
-}
-# }}}
-
-# {{{ support hardware synthesizer via speakup
-config_hwspeak(){
-   if checkbootparam 'speakup.synth' ; then
-      einfo "Bootoption speakup.synth found."
-      eindent
-
-      module="$(getbootparam 'speakup.synth' 2>>$DEBUG)"
-      if [ -z "$module" ] ; then
-         eerror "Sorry, no speakup module specified for bootoption speakup.synth."
-         flitewrapper "Sorry, no speakup module specified for bootoption speakup.synth."
-      else
-         einfo "Trying to load $module"
-         modprobe "speakup_${module}"
-         eend $?
-      fi
-
-      if [ -d /proc/speakup/ ] || grep -q speakup /proc/modules ; then
-         einfo "Kernel should support speakup now." ; eend 0
-         flitewrapper "Kernel should support speakup now."
-      else
-         eerror "Kernel or hardware do not seem to support speakup. Skipping hwspeak." ; eend 1
-         flitewrapper "Kernel or hardware do not seem to support speakup. Sorry."
-      fi
-
-      eoutdent
-
-   # hwspeak:
-   elif checkbootparam 'hwspeak' ; then
-      einfo "Bootoption hwspeak found."
-
-      if [ ! -d /proc/speakup/ ] && ! grep -q speakup /proc/modules ; then
-         ewarn "Kernel does not support hardware speakup - trying to load kernel modules:" ; eend 0
-         eindent
-         if ! [ -d "/lib/modules/${KERNEL}/extra/speakup/" ] ; then
-            eerror "Kernel does not provide speakup modules, sorry." ; eend 1
-         else
-           for module in $(find "/lib/modules/${KERNEL}/extra/speakup/" -name \*.ko | \
-                           sed 's#.*speakup/##g ; s#.ko$##g' | \
-                           grep -ve speakup_soft -ve speakup_dummy | sort -u) ; do
-              einfo "Trying to load $module"
-              modprobe $module
-              eend $?
-           done
-         fi
-         eoutdent
-      fi
-
-      if [ -d /proc/speakup/ ] || grep -q speakup /proc/modules ; then
-         einfo "Kernel should support speakup now." ; eend 0
-         flitewrapper "Kernel should support speakup now."
-      else
-         eerror "Kernel or hardware do not seem to support speakup. Skipping hwspeak." ; eend 1
-         flitewrapper "Kernel or hardware do not seem to support speakup. Sorry."
-      fi
-   fi
-}
-# }}}
-
-# {{{ Check for blind option or brltty
-config_blind(){
-BLIND=""
-checkbootparam 'blind' && BLIND="yes"
-BRLTTY="$(getbootparam 'brltty' 2>>$DEBUG)"
-
-if [ -n "$BLIND" -o -n "$BRLTTY" ]; then
-  if [ -x /sbin/brltty ]; then
-    # Blind option detected, start brltty now.
-    # modprobe serial_core parport_serial generic_serial && echo "done"
-    CMD=brltty
-    BRLTYPE=""
-    BRLDEV=""
-    BRLTEXT=""
-    if [ -n "$BRLTTY" ]; then
-      # Extra options
-      BRLTYPE="${BRLTTY%%,*}"
-      R="${BRLTTY#*,}"
-      if [ -n "$R" -a "$R" != "$BRLTTY" ]; then
-        BRLTTY="$R"
-        BRLDEV="${BRLTTY%%,*}"
-        R="${BRLTTY#*,}"
-        if [ -n "$R" -a "$R" != "$BRLTTY" ]; then
-          BRLTTY="$R"
-          BRLTEXT="${BRLTTY%%,*}"
-          R="${BRLTTY#*,}"
-        fi
-      fi
-    fi
-    [ -n "$BRLTYPE" ] && CMD="$CMD -b $BRLTYPE"
-    [ -n "$BRLDEV"  ] && CMD="$CMD -d $BRLDEV"
-    [ -n "$BRLTEXT" ] && CMD="$CMD -t $BRLTEXT"
-    einfo "Starting braille-display manager."
-#    ( exec $CMD & )
-    ( sh -c "$CMD" & )
-    sleep 2 && BLINDSOUND="yes"
-    eend 0
-  fi
-fi
-}
-# }}}
-

 # {{{ AGP
 config_agp(){
 if checkbootparam 'forceagp' ; then
 # {{{ AGP
 config_agp(){
 if checkbootparam 'forceagp' ; then


@@ -1512,23 +1375,6 @@ config_netscript() {
 }
 # }}}
 
 }
 # }}}
 

-# {{{ blindsound
-config_blindsound(){
- if checkbootparam 'blind' ; then
-    beep
-    flitewrapper "welcome to the gremel system"
- fi
-}
-# }}}
-
-# {{{ welcome sound
-config_welcome(){
- if checkbootparam 'welcome' ; then
-    flitewrapper "welcome to the gremel system"
- fi
-}
-# }}}
-

 # {{{ fix/workaround for unionfs
 fix_unionfs(){
   if [ -z "$INSTALLED" ]; then
 # {{{ fix/workaround for unionfs
 fix_unionfs(){
   if [ -z "$INSTALLED" ]; then

diff --git a/grml-autoconfig b/grml-autoconfig
index b15acb0..82594b7 100755 (executable)
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -99,10 +99,6 @@ checkvalue $CONFIG_LANGUAGE && config_language
 
 checkvalue $CONFIG_LOG && config_log
 
 
 checkvalue $CONFIG_LOG && config_log
 

-checkvalue $CONFIG_SWSPEAK && config_swspeak
-
-checkvalue $CONFIG_HWSPEAK && config_hwspeak
-

 checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
 
 checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
 checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
 
 checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd


@@ -150,8 +146,6 @@ checkvalue $CONFIG_ACPI_APM && config_acpi_apm
 
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
 
 
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
 

-checkvalue $CONFIG_BLIND && config_blind
-

 checkvalue $CONFIG_AGP && config_agp
 
 checkvalue $CONFIG_DMA && config_dma
 checkvalue $CONFIG_AGP && config_agp
 
 checkvalue $CONFIG_DMA && config_dma


@@ -216,10 +210,6 @@ checkvalue $CONFIG_DEBNET && config_debnet
 
 checkvalue $CONFIG_CONSOLE && config_console
 
 
 checkvalue $CONFIG_CONSOLE && config_console
 

-checkvalue $CONFIG_BLINDSOUND && config_blindsound
-
-checkvalue $CONFIG_WELCOME && config_welcome
-

 checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
 
 checkvalue $CONFIG_915RESOLUTION && config_915resolution
 checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
 
 checkvalue $CONFIG_915RESOLUTION && config_915resolution