From: David Vincent <freesilicon@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/4] core-image: Set default sshd configuration
Date: Mon, 23 Jan 2017 15:55:06 +0100 [thread overview]
Message-ID: <20170123145508.9252-3-freesilicon@gmail.com> (raw)
In-Reply-To: <20170123145508.9252-1-freesilicon@gmail.com>
When selecting OpenSSH as ssh server provider instead of dropbear, also
install the correct configuration depending on whether the final rootfs
is read-only or not.
Signed-off-by: David Vincent <freesilicon@gmail.com>
---
meta/classes/core-image.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 8431440db4..d1f643d920 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -41,7 +41,7 @@ FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone
FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server"
FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client"
FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
-FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh"
+FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh ${SSHD_CONFIG}"
FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}"
@@ -52,6 +52,7 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2'
# An error exception would be raised if both image features foo and bar1(or bar2) are included
+SSHD_CONFIG ??= "${@bb.utils.contains('IMAGE_FEATURES','read-only-rootfs','openssh-sshd-config-readonly','openssh-sshd-config',d)}"
MACHINE_HWCODECS ??= ""
CORE_IMAGE_BASE_INSTALL = '\
--
2.11.0
next prev parent reply other threads:[~2017-01-23 14:56 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-23 14:55 [PATCH 0/4] openssh: Make sshd-config a package David Vincent
2017-01-23 14:55 ` [PATCH 1/4] openssh: Package server configuration David Vincent
2017-01-23 14:55 ` David Vincent [this message]
2017-01-23 14:55 ` [PATCH 3/4] rootfs-postcommands: Modify ssh-related commands David Vincent
2017-01-23 14:55 ` [PATCH 4/4] ref-manual: Add SSHD_CONFIG David Vincent
2017-01-23 15:23 ` ✗ patchtest: failure for openssh: Make sshd-config a package Patchwork
2017-01-23 15:45 ` David Vincent
2017-01-23 16:08 ` Leonardo Sandoval
2017-01-23 16:39 ` David Vincent
2017-01-23 17:56 ` Leonardo Sandoval
2017-01-24 8:43 ` [PATCH 0/3] " David Vincent
2017-01-24 8:43 ` [PATCH 1/3] openssh: Package server configuration David Vincent
2017-01-24 8:43 ` [PATCH 2/3] core-image: Set default sshd configuration David Vincent
2017-01-24 8:43 ` [PATCH 3/3] rootfs-postcommands: Modify ssh-related commands David Vincent
2017-01-24 9:07 ` [PATCH v2 0/3] openssh: Make sshd-config a package David Vincent
2017-01-24 9:07 ` [PATCH 1/3] openssh: Package server configuration David Vincent
2017-01-24 9:07 ` [PATCH 2/3] core-image: Set default sshd configuration David Vincent
2017-01-24 9:07 ` [PATCH 3/3] rootfs-postcommands: Modify ssh-related commands David Vincent
2017-01-24 19:07 ` [PATCH v2 0/3] openssh: Make sshd-config a package Khem Raj
2017-01-25 7:58 ` David Vincent
2017-02-02 10:30 ` [PATCH v3 " David Vincent
2017-02-02 10:30 ` [PATCH v3 1/3] openssh: Package server configuration David Vincent
2017-02-02 10:30 ` [PATCH v3 2/3] core-image: Set default sshd configuration David Vincent
2017-02-02 10:30 ` [PATCH v3 3/3] rootfs-postcommands: Modify ssh-related commands David Vincent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170123145508.9252-3-freesilicon@gmail.com \
--to=freesilicon@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox