diff options
| author |   Laszlo Papp <lpapp@kde.org> | 2014-01-30 18:41:35 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 22:34:33 +0000 |
| commit | 0ca984f32682151cfeff852167f0174aca20a8bc (patch) | |
| tree | ae63206509d8a9e01099ce4446b5cf0c39ac416c /meta/recipes-core | |
| parent | f825549d18477bc2c02e96f7a879b36bad1be18d (diff) | |
| download | openembedded-core-contrib-0ca984f32682151cfeff852167f0174aca20a8bc.tar.gz | |
meta/recipes-core/base-passwd/base-passwd/noshadow.patch: Split it into two parts
The current change contains two different logics resulting that users like me
may need to partially override the behavior of it. It would be easier for end
users to keep one change while dropping the other if needed, like in our case.
Signed-off-by: Laszlo Papp <lpapp@kde.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/base-passwd/base-passwd/nobash.patch | 10 | ||||
| -rw-r--r-- | meta/recipes-core/base-passwd/base-passwd/noshadow.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 1 |
3 files changed, 16 insertions, 9 deletions
diff --git a/meta/recipes-core/base-passwd/base-passwd/nobash.patch b/meta/recipes-core/base-passwd/base-passwd/nobash.patch index 63715764400..eed87db6cb1 100644 --- a/meta/recipes-core/base-passwd/base-passwd/nobash.patch +++ b/meta/recipes-core/base-passwd/base-passwd/nobash.patch @@ -1,14 +1,6 @@ use /bin/sh instead of /bin/bash, since the latter may not be included in some images such as minimal -comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 - -remove "*" for root since we don't have a /etc/shadow so far. - -by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 - -Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher - Upstream-Status: Invalid [configuration] Signed-off-by: Scott Garman <scott.a.garman@intel.com> @@ -17,7 +9,7 @@ Signed-off-by: Scott Garman <scott.a.garman@intel.com> +++ base-passwd/passwd.master @@ -1,4 +1,4 @@ -root:*:0:0:root:/root:/bin/bash -+root::0:0:root:/root:/bin/sh ++root:*:0:0:root:/root:/bin/sh daemon:*:1:1:daemon:/usr/sbin:/bin/sh bin:*:2:2:bin:/bin:/bin/sh sys:*:3:3:sys:/dev:/bin/sh diff --git a/meta/recipes-core/base-passwd/base-passwd/noshadow.patch b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch new file mode 100644 index 00000000000..e1cded61d6f --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch @@ -0,0 +1,14 @@ +remove "*" for root since we don't have a /etc/shadow so far. + +Upstream-Status: Invalid [configuration] + +Signed-off-by: Scott Garman <scott.a.garman@intel.com> + +--- base-passwd/passwd.master~nobash ++++ base-passwd/passwd.master +@@ -1,4 +1,4 @@ +-root:*:0:0:root:/root:/bin/sh ++root::0:0:root:/root:/bin/sh + daemon:*:1:1:daemon:/usr/sbin:/bin/sh + bin:*:2:2:bin:/bin:/bin/sh + sys:*:3:3:sys:/dev:/bin/sh diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index 082037a2a3b..5b31fce87f6 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb @@ -9,6 +9,7 @@ DEPENDS = "docbook-utils-native linuxdoc-tools-native" SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \ file://add_shutdown.patch \ file://nobash.patch \ + file://noshadow.patch \ file://input.patch \ file://disable-docs.patch \ " |