Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ce410d6 authored Mar 23, 2017 by Anton Blanchard Committed by Michael Ellerman Mar 28, 2017

powerpc/configs: Re-enable ISO9660_FS as a built-in in 64 bit configs



It turns out cloud-config uses ISO9660 filesystems to inject
configuration data into cloud images. The cloud-config failures when
ISO9660_FS is not enabled are cryptic, and building it in makes
mainline testing easier, so re-enable it.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 517c2757

arch/powerpc/configs/powernv_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ CONFIG_NILFS2_FS=m
		CONFIG_AUTOFS4_FS=m
		CONFIG_FUSE_FS=m
		CONFIG_OVERLAY_FS=m
		CONFIG_ISO9660_FS=m
		CONFIG_ISO9660_FS=y
		CONFIG_UDF_FS=m
		CONFIG_MSDOS_FS=y
		CONFIG_VFAT_FS=m

arch/powerpc/configs/ppc64_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -291,7 +291,7 @@ CONFIG_NILFS2_FS=m
		CONFIG_AUTOFS4_FS=m
		CONFIG_FUSE_FS=m
		CONFIG_OVERLAY_FS=m
		CONFIG_ISO9660_FS=m
		CONFIG_ISO9660_FS=y
		CONFIG_UDF_FS=m
		CONFIG_MSDOS_FS=y
		CONFIG_VFAT_FS=m

arch/powerpc/configs/pseries_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ CONFIG_NILFS2_FS=m
		CONFIG_AUTOFS4_FS=m
		CONFIG_FUSE_FS=m
		CONFIG_OVERLAY_FS=m
		CONFIG_ISO9660_FS=m
		CONFIG_ISO9660_FS=y
		CONFIG_UDF_FS=m
		CONFIG_MSDOS_FS=y
		CONFIG_VFAT_FS=m