From a1d6b55bfa5daa9ba5fa9a7a99dd8872284b6ad8 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Tue, 22 Oct 2013 11:11:59 +0800 Subject: base-files: remove invalid entries from /etc/shells It's more reasonable and secure to keep /etc/shells a minimal file, and then entries for valid shells be added dynamically to the system, only if the packages that provide them are supported. Signed-off-by: Ming Liu Signed-off-by: Saul Wold --- meta/recipes-core/base-files/base-files/shells | 6 ------ meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'meta/recipes-core/base-files') diff --git a/meta/recipes-core/base-files/base-files/shells b/meta/recipes-core/base-files/base-files/shells index ce39b3dde7..3f639874d8 100644 --- a/meta/recipes-core/base-files/base-files/shells +++ b/meta/recipes-core/base-files/base-files/shells @@ -1,8 +1,2 @@ # /etc/shells: valid login shells /bin/sh -/bin/ash -/bin/bash -/bin/dash -/bin/ksh -/usr/bin/ksh -/usr/bin/screen diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 054fefa050..be3921ab35 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -143,5 +143,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}" +CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]} ${sysconfdir}/shells" -- cgit 1.2.3-korg