From 736d0b29c6246658a925ea9036ccfe6216d12837 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 19 Aug 2021 17:56:21 +0800 Subject: [PATCH] shadow: add /etc/default/useradd The shadow 4.9 stops shiping /etc/default/useradd[1] and uses built-in settings by default. Some settings are not consistent with previous shadow 4.8.1 in oe-core. e.g. The default shell is /bin/bash rather than /bin/sh. Per shadow 4.8.1 settings, add /etc/default/useradd back. [1] https://github.com/shadow-maint/shadow/commit/bbf4b79bc49fd1826eb41f6629669ef0b647267b Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- meta/recipes-extended/shadow/files/useradd | 8 ++++++++ meta/recipes-extended/shadow/shadow.inc | 3 +++ 2 files changed, 11 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/useradd diff --git a/meta/recipes-extended/shadow/files/useradd b/meta/recipes-extended/shadow/files/useradd new file mode 100644 index 0000000000..782aeef418 --- /dev/null +++ b/meta/recipes-extended/shadow/files/useradd @@ -0,0 +1,8 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/sh +SKEL=/etc/skel +CREATE_MAIL_SPOOL=no diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index c1e24b4f16..c35cc8396d 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -17,6 +17,7 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/v${PV}/${BP} file://0001-Fix-out-of-tree-builds-with-respect-to-libsubid-incl.patch \ file://0001-libsubid-link-to-PAM-libraries.patch \ file://0001-libmisc-fix-default-value-in-SHA_get_salt_rounds.patch \ + file://useradd \ " SRC_URI:append:class-target = " \ @@ -116,6 +117,8 @@ do_install() { # Use proper encryption for passwords sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default } do_install:append() { -- 2.40.1