summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2017-06-29 13:28:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-09 22:48:38 +0100
commit7c1adcc6d7e00c5b2ea427c7a023dc9faee40582 (patch)
tree94d9564f01ee3d684f1619ecd94f3e7b16c9f080 /meta/lib
parentbe73d2bf15eb6b9afca324e0dd4b1a24c00a1f8e (diff)
downloadpoky-7c1adcc6d7e00c5b2ea427c7a023dc9faee40582.tar.gz
rootfs-postcommands: split ssh_allow_empty_password
"allow root login" should not be bundled in ssh_allow_empty_password, because some distro may want only one of "allow root login" and "allow empty password", so split it out into ssh_allow_root_login and add new imagefeature allow-root-login so they can be controlled separately, debug-tweaks will still include both of them. (From OE-Core rev: 1ab494f06a12548a902298afabd0a842161ef10d) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/imagefeatures.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 09e0b20625..b60ab8ae7e 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -23,7 +23,7 @@ class ImageFeatures(OESelftestTestCase):
23 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> 23 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
24 """ 24 """
25 25
26 features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n' 26 features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password allow-root-login"\n'
27 features += 'INHERIT += "extrausers"\n' 27 features += 'INHERIT += "extrausers"\n'
28 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) 28 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user)
29 self.write_config(features) 29 self.write_config(features)
@@ -49,7 +49,7 @@ class ImageFeatures(OESelftestTestCase):
49 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> 49 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
50 """ 50 """
51 51
52 features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n' 52 features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password allow-root-login"\n'
53 features += 'INHERIT += "extrausers"\n' 53 features += 'INHERIT += "extrausers"\n'
54 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) 54 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user)
55 self.write_config(features) 55 self.write_config(features)