Message ID | 20210114164609.3772388-2-marcelo.cerri@canonical.com |
---|---|
State | New |
Headers | show |
Series | [bionic:linux-azure-4.15,1/1] UBUNTU: [Config] azure: Disable ATARI_PARTITION | expand |
On Thu, Jan 14, 2021 at 01:46:07PM -0300, Marcelo Henrique Cerri wrote: > --- a/debian.azure-4.15/config/config.common.ubuntu > +++ b/debian.azure-4.15/config/config.common.ubuntu > @@ -262,7 +262,7 @@ CONFIG_ASYNC_XOR=m > # CONFIG_AT803X_PHY is not set > CONFIG_ATA=y > CONFIG_ATALK=m > -CONFIG_ATARI_PARTITION=y > +CONFIG_ATARI_PARTITION=n > CONFIG_ATA_ACPI=y > CONFIG_ATA_BMDMA=y > CONFIG_ATA_GENERIC=y How come this one is not the usual "# CONFIG_WHATEVER is not set" format? -Kamal
On Thu, Jan 14, 2021 at 09:42:38AM -0800, Kamal Mostafa wrote: > On Thu, Jan 14, 2021 at 01:46:07PM -0300, Marcelo Henrique Cerri wrote: > > --- a/debian.azure-4.15/config/config.common.ubuntu > > +++ b/debian.azure-4.15/config/config.common.ubuntu > > @@ -262,7 +262,7 @@ CONFIG_ASYNC_XOR=m > > # CONFIG_AT803X_PHY is not set > > CONFIG_ATA=y > > CONFIG_ATALK=m > > -CONFIG_ATARI_PARTITION=y > > +CONFIG_ATARI_PARTITION=n > > CONFIG_ATA_ACPI=y > > CONFIG_ATA_BMDMA=y > > CONFIG_ATA_GENERIC=y > > How come this one is not the usual "# CONFIG_WHATEVER is not set" format? Now that you mentioned it, that looks wrong to me. I manually set it to "n" and then ran `fakeroot debian/rules udpateconfigs`. It seems that in those cases it doesn't update the config to the above format. If I remove the config line and then respond with "n" when updateconfigs asks about it, then I get the commented line. I will update the patches because I think that will cause problems in the future. > > -Kamal
diff --git a/debian.azure-4.15/config/annotations b/debian.azure-4.15/config/annotations index 91854a8fd282..cf9a019fc4ec 100644 --- a/debian.azure-4.15/config/annotations +++ b/debian.azure-4.15/config/annotations @@ -136,6 +136,9 @@ CONFIG_LOOPBACK_TARGET mark<ENFORCED> note<LP#179179 CONFIG_BT_HS policy<{'amd64': '-'}> CONFIG_BT_HS mark<ENFORCED> note<https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00435.html> +CONFIG_ATARI_PARTITION policy<{'amd64': 'n'}> +CONFIG_ATARI_PARTITION mark<ENFORCED> note<LP:1908264> + # From linux-azure initial packaging CONFIG_POWERCAP policy<{'amd64': 'n'}> diff --git a/debian.azure-4.15/config/config.common.ubuntu b/debian.azure-4.15/config/config.common.ubuntu index 48693eb5ec48..e3c24bbfdecb 100644 --- a/debian.azure-4.15/config/config.common.ubuntu +++ b/debian.azure-4.15/config/config.common.ubuntu @@ -262,7 +262,7 @@ CONFIG_ASYNC_XOR=m # CONFIG_AT803X_PHY is not set CONFIG_ATA=y CONFIG_ATALK=m -CONFIG_ATARI_PARTITION=y +CONFIG_ATARI_PARTITION=n CONFIG_ATA_ACPI=y CONFIG_ATA_BMDMA=y CONFIG_ATA_GENERIC=y
BugLink: https://bugs.launchpad.net/bugs/1908264 Support for Atari partitions is not available in the Azure so disable it for the same reasons we disable it in other cloud kernels. Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> --- debian.azure-4.15/config/annotations | 3 +++ debian.azure-4.15/config/config.common.ubuntu | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)