Index: ccc/kudzu/kudzu
diff -u ccc/kudzu/kudzu:1.10 ccc/kudzu/kudzu:1.11
--- ccc/kudzu/kudzu:1.10	Thu Apr 27 16:20:18 2000
+++ ccc/kudzu/kudzu	Thu Jun 15 18:25:27 2000
@@ -76,7 +76,6 @@
 # On Rev 6 boards with sound, they use pcsnd.
 #
 if [ $BOARD_REV -le $REV_5 -a $RACK -eq 0 -o $SCSI -eq 1 ]; then
-	echo true;
 	cat <<-EOF >> $FILE
 	alias char-major-14 soundcore
 	alias sound-slot-0 waveartist
@@ -88,6 +87,7 @@
 	options adlib_card io=0x388
 	post-install waveartist modprobe -k adlib_card
 	EOF
+	sound=1
 elif [ $BOARD_REV -gt $REV_5 -a $RACK -eq 0 ]; then
 	cat <<-EOF >> $FILE
 	alias char-major-14 soundcore
@@ -98,6 +98,9 @@
 	alias sound-service-0-4 pcsnd
 	alias sound-service-0-6 pcsnd
 	EOF
+	sound=1
+else
+	sound=0
 fi
 
 #
@@ -173,9 +176,27 @@
 FILE=/etc/rc.d/rc.local
 
 cp -ax $FILE $FILE~
+if grep -q '^### Begin' $FILE~ ; then
+	sed -e '/^### Begin/,/^### End/d' $FILE~ > $FILE
+else
+	grep -v '^cat /etc/welcome' $FILE~ > $FILE
+fi
 
-if [ $RACK -eq 1 -a $SCSI -eq 0 ]; then
-	sed -e "s|^cat /etc/welcome.au|#cat /etc/welcome.au|" $FILE~ > $FILE
+if [ $sound -eq 1 -a $BOARD_REV -eq $REV_5 ]; then
+	cat << 'EOF' >> $FILE
+### Begin welcome message (do not edit this; auto-generated by kudzu)
+if [ -e /sbin/lspci ]; then
+	# Tweak ISA bridge registers for more reliable sound playback
+	device=`lspci|grep 553|cut -d' ' -f1`
+	setpci -s $device 0x40.l=0xef010422 0x80.l=0x02000011 >/dev/null
+fi
+cat /etc/welcome.au >/dev/audio
+if [ -e /sbin/lspci ]; then
+	# Restore original ISA bridge register settings
+	setpci -s $device 0x40.l=0xef000422 0x80.l=0x020001e0 >/dev/null
+fi
+### End welcome message
+EOF
 fi
 
 #
Index: ccc/kudzu/kudzu.spec
diff -u ccc/kudzu/kudzu.spec:1.10 ccc/kudzu/kudzu.spec:1.11
--- ccc/kudzu/kudzu.spec:1.10	Thu Jun 15 18:34:10 2000
+++ ccc/kudzu/kudzu.spec	Tue Sep  5 13:22:48 2000
@@ -58,6 +58,10 @@
 /lib/modules/misc/findpci.o
 
 %changelog
+* Tue Sep 05 2000 Rod m. Stewart <stewart@netwinder.org>
+- Do not enable disk DMA in rc.sysinit.  We now enable 
+  it in rc.local after the welcome message has been played.
+
 * Thu Jun 15 2000 Ralph Siemsen <ralphs@netwinder.org>
 - More changes to sound playing