diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-04-30 15:32:06 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-02 17:40:51 +0100 |
| commit | 013a1e304e6845eda97b94d133ad75bbccff0b9a (patch) | |
| tree | db23995792642d2abcf48565d1c0bfb68de32f9a | |
| parent | 40acb88afb2ebd2d468bb2fce51c6ce6bf3d8403 (diff) | |
| download | openembedded-core-013a1e304e6845eda97b94d133ad75bbccff0b9a.tar.gz openembedded-core-013a1e304e6845eda97b94d133ad75bbccff0b9a.tar.bz2 openembedded-core-013a1e304e6845eda97b94d133ad75bbccff0b9a.zip | |
shadow-securetty: change to handle SERIAL_CONSOLES
SERIAL_CONSOLES is now set from SERIAL_CONSOLE if not already set. This
change also installs the file before modifying it in place, allowing
do_install to re-execute properly.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb index 86b5c8978a..4a1f79f8e5 100644 --- a/meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow-securetty_4.1.4.3.bb @@ -10,22 +10,28 @@ PR = "r2" SRC_URI = "file://securetty" -# Since we deduce our arch from ${SERIAL_CONSOLE} +# Since SERIAL_CONSOLES is likely to be set from the machine configuration PACKAGE_ARCH = "${MACHINE_ARCH}" do_install () { # Ensure we add a suitable securetty file to the package that has # most common embedded TTYs defined. - if [ ! -z "${SERIAL_CONSOLE}" ]; then - # Our SERIAL_CONSOLE contains a baud rate and sometimes a -L - # option as well. The following pearl :) takes that and converts + install -d ${D}${sysconfdir} + install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty + if [ ! -z "${SERIAL_CONSOLES}" ]; then + # Our SERIAL_CONSOLES contains a baud rate and sometimes extra + # options as well. The following pearl :) takes that and converts # it into newline-separated tty's and appends them into # securetty. So if a machine has a weird looking console device # node (e.g. ttyAMA0) that securetty does not know, it will get # appended to securetty and root logins will be allowed on that # console. - echo "${SERIAL_CONSOLE}" | sed -e 's/[0-9][0-9]\|\-L//g'|tr "[ ]" "[\n]" >> ${WORKDIR}/securetty + tmp="${SERIAL_CONSOLES}" + for entry in $tmp ; do + ttydev=`echo "$entry" | sed -e 's/^[0-9]*\;//' -e 's/\;.*//'` + if ! grep -q $ttydev ${D}${sysconfdir}/securetty; then + echo $ttydev >> ${D}${sysconfdir}/securetty + fi + done fi - install -d ${D}${sysconfdir} - install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty } |