From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH] image: configscript: no need to change /etc/inittab on systemd
Date: Thu, 28 Sep 2017 16:08:24 +0200 [thread overview]
Message-ID: <20170928140824.27003-1-henning.schild@siemens.com> (raw)
Make the manipulation of /etc/inittab depend on the existance of that
file. Newer distros do not have that file anymore.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
meta-isar/recipes-core/images/files/debian-configscript.sh | 7 +++++--
meta-isar/recipes-core/images/files/raspbian-configscript.sh | 8 +++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh
index 31a20d2..698277c 100644
--- a/meta-isar/recipes-core/images/files/debian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/debian-configscript.sh
@@ -69,8 +69,11 @@ if [ ! -e /dev/console ]; then
mknod /dev/console c 5 1
fi
-# Enable tty
-echo "T0:23:respawn:/sbin/getty -L $MACHINE_SERIAL $BAUDRATE_TTY vt100" >> /etc/inittab
+# Enable tty conditionally, systemd does not have the file but its own magic
+if [ -f /etc/inittab ]; then
+ echo "T0:23:respawn:/sbin/getty -L $MACHINE_SERIAL $BAUDRATE_TTY vt100" \
+ >> /etc/inittab
+fi
# Undo setup script changes
if [ -x "$TARGET/sbin/start-stop-daemon.REAL" ]; then
diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
index 5eacb3b..61a1aa5 100644
--- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
@@ -68,9 +68,11 @@ devtmpfs /dev devtmpfs mode=0755,nosuid 0 0
# End /etc/fstab
EOF
-# Enable tty
-echo "T0:23:respawn:/sbin/getty -L $MACHINE_SERIAL $BAUDRATE_TTY vt100" \
- >> /etc/inittab
+# Enable tty conditionally, systemd does not have the file but its own magic
+if [ -f /etc/inittab ]; then
+ echo "T0:23:respawn:/sbin/getty -L $MACHINE_SERIAL $BAUDRATE_TTY vt100" \
+ >> /etc/inittab
+fi
# Undo setup script changes
if [ -x "$TARGET/sbin/start-stop-daemon.REAL" ]; then
--
2.13.6
next reply other threads:[~2017-09-28 14:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-28 14:08 Henning Schild [this message]
2017-10-05 13:04 ` Alexander Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170928140824.27003-1-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox