From fe4af1cf50ca07260086c87079cb7cae6a010bae Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 18 May 2015 13:14:41 +0000
Subject: bsp: Add DEVPTS_MULTIPLE_INSTANCES

This makes system containers work better.
Now it is possible to log in with ssh or `machinectl login`
to any containers started by systemd-nspawn.

Change-Id: Ia038355b48e13fe67996a488660fecdfc5ae1215
---
 strata/bsp-armv7-highbank/linux-armv7-highbank.morph           | 1 +
 strata/bsp-armv7-versatile/linux-armv7-versatile.morph         | 1 +
 strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph         | 1 +
 strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph | 1 +
 strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph       | 1 +
 strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph       | 1 +
 strata/bsp-jetson/linux-jetson-tk1.morph                       | 1 +
 strata/bsp-ppc64-generic/linux-ppc64.morph                     | 1 +
 strata/bsp-wandboard/linux-armv7-wandboard.morph               | 1 +
 strata/bsp-x86_32-generic/linux-x86-32-generic.morph           | 1 +
 strata/bsp-x86_64-generic/linux-x86-64-generic.morph           | 1 +
 11 files changed, 11 insertions(+)

diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
index b03e17ad..e904ff45 100644
--- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
@@ -33,6 +33,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config --set-str UEVENT_HELPER_PATH ''
 - scripts/config -e DM_SNAPSHOT
 - scripts/config -e IKCONFIG
diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
index 7e66ce73..ed0194b8 100644
--- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
@@ -10,6 +10,7 @@ configure-commands:
 - scripts/config -e FUSE_FS
 - scripts/config -e OVERLAY_FS
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config -e BLK_DEV_LOOP
diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
index 377aaa8d..1b86d320 100644
--- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
@@ -18,6 +18,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e BLK_DEV_LOOP
 - scripts/config -e BTRFS_FS
 - scripts/config -e TMPFS
diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
index c232c493..fd6fab15 100644
--- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
@@ -26,6 +26,7 @@ configure-commands:
 - scripts/config -e IKCONFIG_PROC
 - scripts/config -e CGROUPS
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e AUTOFS4_FS
 - scripts/config -e NETWORK_FILESYSTEMS
 - scripts/config -e NFS_FS
diff --git a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph
index ecf383b0..9362eb6e 100644
--- a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph
+++ b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph
@@ -12,6 +12,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph
index 018e5710..dd54b4e4 100644
--- a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph
+++ b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph
@@ -12,6 +12,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph
index 073a5a02..784a39c4 100644
--- a/strata/bsp-jetson/linux-jetson-tk1.morph
+++ b/strata/bsp-jetson/linux-jetson-tk1.morph
@@ -15,6 +15,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-ppc64-generic/linux-ppc64.morph b/strata/bsp-ppc64-generic/linux-ppc64.morph
index b8b189c7..d2ef0747 100644
--- a/strata/bsp-ppc64-generic/linux-ppc64.morph
+++ b/strata/bsp-ppc64-generic/linux-ppc64.morph
@@ -13,6 +13,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph
index bf337725..8137198e 100644
--- a/strata/bsp-wandboard/linux-armv7-wandboard.morph
+++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph
@@ -15,6 +15,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
index 1616748f..208eb506 100644
--- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
+++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
@@ -22,6 +22,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
index 7364b033..bc8ac7d1 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -22,6 +22,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
-- 
cgit v1.2.1