[Morphix-cvs] scripts-base/etc/init.d alsa-autoconfig,1.3,1.4 knoppix-autoconfig,1.15,1.16 morphix-start,1.19,1.20

[<ale...@us...>]

Update of /cvsroot/morphix/scripts-base/etc/init.d
In directory sc8-pr-cvs1:/tmp/cvs-serv23532/init.d

Modified Files:
	alsa-autoconfig knoppix-autoconfig morphix-start 
Log Message:
possible 0.4-1b files


Index: alsa-autoconfig
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/alsa-autoconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** alsa-autoconfig	21 Apr 2003 14:13:37 -0000	1.3
--- alsa-autoconfig	6 Dec 2003 22:30:49 -0000	1.4
***************
*** 12,16 ****
  then
  cat << EOF > /etc/modutils/1alsa
! path[alsa]=$ALSAPATH
  depfile=$ALSAPATH/modules.dep
  generic_stringfile=$ALSAPATH/modules.generic_string
--- 12,16 ----
  then
  cat << EOF > /etc/modutils/1alsa
! path[misc]=$ALSAPATH
  depfile=$ALSAPATH/modules.dep
  generic_stringfile=$ALSAPATH/modules.generic_string
***************
*** 172,176 ****
  
      CARD_DRIVER=snd-$1
! #    CARD_OPTS="${*:2}"
      if [ -z "$CARD_OPTS" ]; then
  	CARD_OPTS="${mpfx}index=0"
--- 172,176 ----
  
      CARD_DRIVER=snd-$1
! #    CARD_OPTS="${*:2}" # FIXME
      if [ -z "$CARD_OPTS" ]; then
  	CARD_OPTS="${mpfx}index=0"
***************
*** 226,232 ****
      [ -n "$GAUGE" ] && echo 80
      update-modules 2>/dev/null
      [ -n "$GAUGE" ] && echo 90
!     #touch -r /etc/modules.conf $DESTDIR/modules.dep
! 
      #echo Loading driver...
      #/etc/init.d/alsa start
--- 226,234 ----
      [ -n "$GAUGE" ] && echo 80
      update-modules 2>/dev/null
+     touch -r $ALSAPATH/modules.dep /etc/modules.conf
+     [ -n "$DEBUG" ] && echo "Creating snddevices..." 
+     /usr/sbin/alsa_snddevices >/dev/null 2>/dev/null
      [ -n "$GAUGE" ] && echo 90
!     
      #echo Loading driver...
      #/etc/init.d/alsa start
***************
*** 236,240 ****
      else
  	#set_mixers
! 	aumix -m 0 -v 60 -w 60 # set pcm & master to 60
      fi
      [ -n "$GAUGE" ] && echo 100
--- 238,242 ----
      else
  	#set_mixers
! 	aumix -m 0 -v 60 -w 60 # set pcm & master to 60, micro to 0
      fi
      [ -n "$GAUGE" ] && echo 100

Index: knoppix-autoconfig
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/knoppix-autoconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** knoppix-autoconfig	24 Sep 2003 23:24:41 -0000	1.15
--- knoppix-autoconfig	6 Dec 2003 22:30:50 -0000	1.16
***************
*** 187,191 ****
  	LANGUAGE="be"
  	COUNTRY="be"
! 	LANG="be"
  	KEYTABLE="be-latin1"
  	XKEYBOARD="be"
--- 187,191 ----
  	LANGUAGE="be"
  	COUNTRY="be"
! 	LANG="C" # used to be "be", but thats Belgarian, not belgian
  	KEYTABLE="be-latin1"
  	XKEYBOARD="be"

Index: morphix-start
===================================================================
RCS file: /cvsroot/morphix/scripts-base/etc/init.d/morphix-start,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** morphix-start	24 Sep 2003 23:24:41 -0000	1.19
--- morphix-start	6 Dec 2003 22:30:50 -0000	1.20
***************
*** 194,197 ****
--- 194,198 ----
  				RC="$?"
  			    fi
+ 			    mount --bind /home/morph /mnt/main/home/morph
  			    [ "$RC" = "0" ] && echo "${GREEN}/home/morph mounted OK.${NORMAL}" || { echo "${RED}FAILED."; echo "$ERROR${NORMAL}"; }
  			fi