From 57b0501d49113d11b0a996896aec9a2f4d60abdc Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 15 Jan 2016 13:40:31 +0100 Subject: Do not overwrite /etc/asound.conf Slackware has added PulseAudio plus a /etc/asound.conf file, which configures all ALSA output as an input to PA. An ALSA softvol pre-amp is therefore no longer needed and our Live script should not overwrite the /etc/asound.conf file in the OS. --- make_slackware_live.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'make_slackware_live.sh') diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 56f6c83..fba6645 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1147,8 +1147,11 @@ sed -i ${LIVE_ROOTDIR}/etc/inittab -e "s/\(id:\).\(:initdefault:\)/\1${RUNLEVEL} # But enable NFS client support: [ -f ${LIVE_ROOTDIR}/etc/rc.d/rc.rpc ] && chmod +x ${LIVE_ROOTDIR}/etc/rc.d/rc.rpc -# Add a softvol pre-amp to ALSA - some computers have too low volumes: -cat < ${LIVE_ROOTDIR}/etc/asound.conf +# Add a softvol pre-amp to ALSA - some computers have too low volumes. +# If etc/asound.conf exists it's configuring ALSA to use Pulse, +# so in that case the pre-amp is not needed: +if [ ! -f ${LIVE_ROOTDIR}/etc/asound.conf ]; then + cat < ${LIVE_ROOTDIR}/etc/asound.conf pcm.!default { type asym playback.pcm "plug:softvol" @@ -1162,6 +1165,7 @@ pcm.softvol { max_dB 32.0 } EOAL +fi # Skip all filesystem checks at boot: touch ${LIVE_ROOTDIR}/etc/fastboot -- cgit v1.2.3