summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/base-files
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2013-10-22 11:11:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 15:53:25 +0100
commita1d6b55bfa5daa9ba5fa9a7a99dd8872284b6ad8 (patch)
treed68d488a4910b3656d45668b9e2f8036c2cca0a0 /meta/recipes-core/base-files
parent1e2ec5f576f167673d7980737826987fefdc74a9 (diff)
downloadopenembedded-core-contrib-a1d6b55bfa5daa9ba5fa9a7a99dd8872284b6ad8.tar.gz
openembedded-core-contrib-a1d6b55bfa5daa9ba5fa9a7a99dd8872284b6ad8.tar.bz2
openembedded-core-contrib-a1d6b55bfa5daa9ba5fa9a7a99dd8872284b6ad8.zip
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 <ming.liu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r--meta/recipes-core/base-files/base-files/shells6
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb2
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 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"