UBUNTU: [Config] CONFIG_AUFS_XATTR=y

BugLink: http://bugs.launchpad.net/bugs/1557776
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ebc2fda51f05622448c0942dea8b4f56340daacc..06dc0e456cfdb6b4d7d9b4d1fb57d6246ad74631 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -46,7 +46,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_ATA_PIIX=y
 CONFIG_ATM=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_AUFS_XATTR is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BATMAN_ADV_BATMAN_V is not set

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 0c30ab39596762e2efc2ce2ef2d47f0f6a5bbd78..93765d86b4d86e4714fbc3f0bdfc4e7e36f0c003 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7360,7 +7360,7 @@ CONFIG_LOGFS                                    note<highly discouraged for use>
 CONFIG_AUFS_FS                                  policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_AUFS_HNOTIFY                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_AUFS_EXPORT                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_AUFS_XATTR                               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_AUFS_XATTR                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_AUFS_FHSM                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_AUFS_RDU                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 CONFIG_AUFS_SHWH                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index d1d5f1ceda3bccd8571f4883227eb799503847b1..f89c4c5426c0798137898fc0663d62450cd07c6d 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -54,7 +54,6 @@ CONFIG_ATA_PIIX=m
 # CONFIG_ATH10K_AHB is not set
 CONFIG_ATM=m
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-# CONFIG_AUFS_XATTR is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BATMAN_ADV_BATMAN_V is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index fe69f6a8d5ecc887afcb1e64baf2bd074b62a359..d8372a41c6d1eba8374ec0b227f0eb4f2dfe2527 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -47,7 +47,6 @@ CONFIG_ATA_PIIX=m
 # CONFIG_ATH10K_AHB is not set
 CONFIG_ATM=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_AUFS_XATTR is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BATMAN_ADV_BATMAN_V is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index e51c7f1016f3862d65aeb1109785f0c63f709ac8..3dca8d5504eb8e8af879c5e0d59c4dfdfb0bc25d 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -735,6 +735,7 @@ CONFIG_AUFS_INO_T_64=y
 # CONFIG_AUFS_RDU is not set
 CONFIG_AUFS_SBILIST=y
 # CONFIG_AUFS_SHWH is not set
+CONFIG_AUFS_XATTR=y
 CONFIG_AURORA_NB8800=m
 CONFIG_AUTOFS4_FS=m
 CONFIG_AUTO_ZRELADDR=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 08509729063b1a6af19a11e16fea9f2d7c380903..053296fcf53132c9bb7bdf07c6e4fbd854db9bf6 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -44,7 +44,6 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_ATA_PIIX=y
 CONFIG_ATM=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_AUFS_XATTR is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BATMAN_ADV_BATMAN_V is not set

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 51a634bc01213eb6acfd865819e8d761b0e2c963..7493f2e60315b83ec8b3c553c2d7cf759f695995 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -31,7 +31,6 @@ CONFIG_ATA_PIIX=m
 CONFIG_ATH10K_AHB=y
 CONFIG_ATM=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_AUFS_XATTR is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BCH=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index ed814f1e20656efdb083b1d21ca3cb7f89a5659f..fe0665bf18e674b9546614a9133c0a1474371162 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -40,7 +40,6 @@ CONFIG_ATA_PIIX=m
 CONFIG_ATH10K_AHB=y
 CONFIG_ATM=m
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-# CONFIG_AUFS_XATTR is not set
 CONFIG_AUXDISPLAY=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BATMAN_ADV_BATMAN_V is not set

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 6397f998299f6d78c5884d8027dd6c78c424ad9e..ae97a7dcf45820d8f6b31d69e1a248a5d87ad7a1 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -32,7 +32,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATM is not set
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
-CONFIG_AUFS_XATTR=y
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 # CONFIG_BCM7XXX_PHY is not set