UBUNTU: [Config] re-enable OSS support and blacklist

We are seeing requests for the OSS support to be reenabled, it seems that
it is needed for old games.  We do not want it loading by default so use
the new blacklist support to suppress autoloading.  This should bring us
into line with other distros where manual loading is required.

BugLink: http://bugs.launchpad.net/bugs/1434842
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index cc33a8c888cffc62c4e4d9b7b8095c9df8cb6cf7..132939e5915fc697aa99b1228e3857a77fc9609c 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -7230,7 +7230,8 @@ CONFIG_SND_OXYGEN=m
 CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_PCI=y
 CONFIG_SND_PCMCIA=y
-# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_PCSP=m
 CONFIG_SND_PCXHR=m
 CONFIG_SND_PDAUDIOCF=m

diff --git a/debian.master/modprobe.d/common.conf b/debian.master/modprobe.d/common.conf
new file mode 100644 (file)
index 0000000..e0fbbd6
--- /dev/null
+++ b/debian.master/modprobe.d/common.conf
@@ -0,0 +1,3 @@
+# LP:1434842 -- disable OSS drivers by default to allow pulseaudio to emulate
+blacklist snd-mixer-oss
+blacklist snd-pcm-oss