diff options
author | Ming Liu <ming.liu@windriver.com> | 2013-10-22 11:11:59 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-26 15:59:18 +0100 |
commit | be860ac5bc83571d017127d4a11aa77207af09ac (patch) | |
tree | e56a8daadd3e16db84cf829827f3aeb0d9c6e39e | |
parent | 39356f622d3d2226f12c4930beeaf4b392d90ca5 (diff) | |
download | ast2050-yocto-poky-be860ac5bc83571d017127d4a11aa77207af09ac.zip ast2050-yocto-poky-be860ac5bc83571d017127d4a11aa77207af09ac.tar.gz |
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.
(From OE-Core rev: a1d6b55bfa5daa9ba5fa9a7a99dd8872284b6ad8)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/base-files/base-files/shells | 6 | ||||
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/meta/recipes-core/base-files/base-files/shells b/meta/recipes-core/base-files/base-files/shells index ce39b3d..3f63987 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 054fefa..be3921a 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" |