/[livecd-tools]/trunk/autoconfig
Gentoo

Diff of /trunk/autoconfig

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 101 Revision 102
1#!/sbin/runscript 1#!/sbin/runscript
2# Copyright 1999-2005 Gentoo Foundation 2# Copyright 1999-2005 Gentoo Foundation
3# Distributed under the terms of the GNU General Public License v2 3# Distributed under the terms of the GNU General Public License v2
4# $Header: /var/cvsroot/gentoo/src/livecd-tools/autoconfig,v 1.58 2006/05/19 23:52:00 wolf31o2 Exp $ 4# $Header: /var/cvsroot/gentoo/src/livecd-tools/autoconfig,v 1.59 2006/05/23 12:57:39 wolf31o2 Exp $
5 5
6DHCP="yes" 6DHCP="yes"
7DETECT="yes" 7DETECT="yes"
8GPM="yes" 8GPM="yes"
9PCMCIA="no" 9PCMCIA="no"
91 svcs="${svcs} $(check_svc ${IDEDMA} hdparm)" 91 svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
92 svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)" 92 svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)"
93 svcs="${svcs} $(check_svc ${GPM} gpm)" 93 svcs="${svcs} $(check_svc ${GPM} gpm)"
94 svcs="${svcs} $(check_svc ${HOTPLUG} coldplug hotplug)" 94 svcs="${svcs} $(check_svc ${HOTPLUG} coldplug hotplug)"
95 svcs="${svcs} $(check_svc ${ALSA} alsasound)" 95 svcs="${svcs} $(check_svc ${ALSA} alsasound)"
96 svcs="${svcs} $(check_svc ${X11} x-setup)"
96 97
97 echo ${svcs} 98 echo ${svcs}
98} 99}
99 100
100unpack_firmware() { 101unpack_firmware() {
379 start_service alsasound 380 start_service alsasound
380 fi 381 fi
381 382
382 if [ -e /proc/asound/cards ] 383 if [ -e /proc/asound/cards ]
383 then 384 then
384 for i in $(cat /proc/asound/cards | cut -d" " -f1) 385 for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])
385 do 386 do
386 if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ] 387 if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ]
387 then 388 then
388 amixer -c $i scontrols > /etc/amixer 389 amixer -c $i scontrols > /etc/amixer
389 [ -n "$(grep Master /etc/amixer)" ] \ 390 [ -n "$(grep Master /etc/amixer)" ] \
407 fi 408 fi
408 else 409 else
409 ewarn "Skipping ALSA detection as requested on command line ..." 410 ewarn "Skipping ALSA detection as requested on command line ..."
410 fi 411 fi
411 412
412 if [ "${DETECT}" = "yes" ] 413 if [ "${X11}" = "yes" ]
413 then 414 then
414 [ -x /etc/init.d/x-setup ] && start_service x-setup 415 [ -x /etc/init.d/x-setup ] && start_service x-setup
416 else
417 touch /etc/init.d/.noxdm
415 fi 418 fi
416 419
417 [ "${X11}" = "no" ] && touch /etc/init.d/.noxdm
418 [ -n "${XDESC}" ] && einfo "VideoCard: ${HILITE}${XDESC}${NORMAL}" 420 [ -n "${XDESC}" ] && einfo "VideoCard: ${HILITE}${XDESC}${NORMAL}"
419 421
420 killall hwsetup 2>/dev/null 422 killall hwsetup 2>/dev/null
421 echo "6" > /proc/sys/kernel/printk 423 echo "6" > /proc/sys/kernel/printk
422} 424}

Legend:
Removed from v.101  
changed lines
  Added in v.102

  ViewVC Help
Powered by ViewVC 1.1.20