slitaz-boot-scripts rev 12 1.2

Fixed hwconf.sh 'status' + sound=no + rcS msg
author Christophe Lincoln <pankso@slitaz.org>
date Thu Dec 06 11:07:55 2007 +0100 (2007-12-06)
parents a5e2677812ab
children e064ccf30ccc
files etc/init.d/bootopts.sh etc/init.d/hwconf.sh
line diff
     1.1 --- a/etc/init.d/bootopts.sh	Mon Dec 03 12:19:16 2007 +0100
     1.2 +++ b/etc/init.d/bootopts.sh	Thu Dec 06 11:07:55 2007 +0100
     1.3 @@ -8,9 +8,8 @@
     1.4  mount_home()
     1.5  {
     1.6  	echo "Home has been specified to $DEVICE..."
     1.7 -	echo -n "Sleeping 10 s to let the kernel detect the device... "
     1.8 +	echo "Sleeping 10 s to let the kernel detect the device... "
     1.9  	sleep 10
    1.10 -	status
    1.11  	if grep -q "$DEVICE" /proc/partitions ; then
    1.12  		echo "Mounting /home on /dev/$DEVICE... "
    1.13  		mv /home/hacker /tmp/hacker-home
     2.1 --- a/etc/init.d/hwconf.sh	Mon Dec 03 12:19:16 2007 +0100
     2.2 +++ b/etc/init.d/hwconf.sh	Thu Dec 06 11:07:55 2007 +0100
     2.3 @@ -1,17 +1,25 @@
     2.4  #!/bin/sh
     2.5  # /etc/init.d/hwconf.sh - SliTaz hardware autoconfiguration.
     2.6  #
     2.7 +. /etc/init.d/rc.functions
     2.8  
     2.9  # Sound configuration stuff. First check if sound=no and remoce all sound
    2.10  # Kernel modules.
    2.11  #
    2.12 -if grep -q "sound=no" /proc/cmdline; then
    2.13 +if grep -q -w "sound=no" /proc/cmdline; then
    2.14  	echo -n "Removing all sound kernel modules..."
    2.15  	rm -rf /lib/modules/`uname -r`/kernel/sound
    2.16  	status
    2.17 +	echo -n "Removing all sound packages..."
    2.18 +	for i in $(grep -l '^DEPENDS=.*alsa-lib' /var/lib/tazpkg/installed/*/receipt) ; do
    2.19 +		pkg=${i#/var/lib/tazpkg/installed/}
    2.20 +		echo 'y' | tazpkg remove ${pkg%/*} >-
    2.21 +	done
    2.22 +	echo 'y' | tazpkg remove alsa-lib >-
    2.23 +	status
    2.24  else
    2.25  	# Config or not config
    2.26 -	if grep -q "sound=noconf" /proc/cmdline; then
    2.27 +	if grep -q -w "sound=noconf" /proc/cmdline; then
    2.28  		echo "Sound configuration is disable from cmdline..."
    2.29  	elif [ ! -f /var/lib/sound-card-driver ]; then
    2.30  		if [ -f /usr/sbin/soundconf ]; then