[Buildroot] [PATCH 1/2] board/minnowboard/post-build.sh: only tweak /etc/inittab if available

[Buildroot] [PATCH 1/2] board/minnowboard/post-build.sh: only tweak /etc/inittab if available

[Peter Korsgaard]

As pointed out in bug #9161, we don't always have an inittab file (if
systemd or no init is used), so the post build script should only try to
tweak it if present.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/minnowboard/post-build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/board/minnowboard/post-build.sh b/board/minnowboard/post-build.sh
index 1406a50..45f7b52 100755
--- a/board/minnowboard/post-build.sh
+++ b/board/minnowboard/post-build.sh
@@ -5,6 +5,8 @@
 cp -v board/minnowboard/grub-${2}.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
 
 # Add a console on tty1
-grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
-sed -i '/GENERIC_SERIAL/a\
+if [ -e ${TARGET_DIR}/etc/inittab ]; then
+    grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
+	sed -i '/GENERIC_SERIAL/a\
 tty1::respawn:/sbin/getty -L  tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab
+fi
-- 
2.8.1

[Buildroot] [PATCH 2/2] board/raspberrypi/post-build.sh: only tweak /etc/inittab if available

[Peter Korsgaard]

As pointed out in bug #9161, we don't always have an inittab file (if
systemd or no init is used), so the post build script should only try to
tweak it if present.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/raspberrypi/post-build.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh
index 7eae14a..5e5eb71 100755
--- a/board/raspberrypi/post-build.sh
+++ b/board/raspberrypi/post-build.sh
@@ -4,6 +4,8 @@ set -u
 set -e
 
 # Add a console on tty1
-grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
-sed -i '/GENERIC_SERIAL/a\
+if [ -e ${TARGET_DIR}/etc/inittab ]; then
+    grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
+	sed -i '/GENERIC_SERIAL/a\
 tty1::respawn:/sbin/getty -L  tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab
+fi
-- 
2.8.1

[Buildroot] [PATCH 1/2] board/minnowboard/post-build.sh: only tweak /etc/inittab if available

[Thomas Petazzoni]

Hello,

On Fri, 26 Aug 2016 11:52:19 +0200, Peter Korsgaard wrote:
> As pointed out in bug #9161, we don't always have an inittab file (if
> systemd or no init is used), so the post build script should only try to
> tweak it if present.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  board/minnowboard/post-build.sh | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Both applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com