| Message ID | 1446849665-12753-2-git-send-email-apw@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Nov 06, 2015 at 10:41:05PM +0000, Andy Whitcroft wrote: > 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> > --- > debian.master/config/config.common.ubuntu | 3 ++- > debian.master/modprobe.d/common.conf | 3 +++ > 2 files changed, 5 insertions(+), 1 deletion(-) > create mode 100644 debian.master/modprobe.d/common.conf > > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index 21f0e90..517e900 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -7122,7 +7122,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 > 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 > -- > 2.6.2 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team Cheers, -- Luís
Applied to wily master-next branch. Cheers, -- Luís
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 21f0e90..517e900 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -7122,7 +7122,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 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
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> --- debian.master/config/config.common.ubuntu | 3 ++- debian.master/modprobe.d/common.conf | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 debian.master/modprobe.d/common.conf