From 3d1a7b6580b48a4fa6b6db50cd1b0131ad2b01c1 Mon Sep 17 00:00:00 2001 From: bauen1 Date: Mon, 29 Mar 2021 19:20:10 +0200 Subject: [PATCH] Make usage of /dev more failure proof /dev/console is not needed / used. --- sysa/musl-1.1.24/binutils-rebuild.sh | 4 +++- sysa/musl-1.1.24/musl-1.1.24.sh | 4 +++- sysa/musl-1.2.2/musl-1.2.2.sh | 5 ++++- sysa/run.sh | 1 - 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sysa/musl-1.1.24/binutils-rebuild.sh b/sysa/musl-1.1.24/binutils-rebuild.sh index 4ac8ff8..775110f 100755 --- a/sysa/musl-1.1.24/binutils-rebuild.sh +++ b/sysa/musl-1.1.24/binutils-rebuild.sh @@ -18,7 +18,9 @@ src_configure() { --includedir=/after/include/ # configure script creates this file - test -f /dev/null && rm /dev/null + if test -f /dev/null; then + rm /dev/null + fi } src_compile() { diff --git a/sysa/musl-1.1.24/musl-1.1.24.sh b/sysa/musl-1.1.24/musl-1.1.24.sh index ac6de04..8b82124 100755 --- a/sysa/musl-1.1.24/musl-1.1.24.sh +++ b/sysa/musl-1.1.24/musl-1.1.24.sh @@ -21,7 +21,9 @@ src_configure() { --includedir=/after/include/musl # configure script creates this file - test -f /dev/null && rm /dev/null + if test -f /dev/null; then + rm /dev/null + fi } src_compile() { diff --git a/sysa/musl-1.2.2/musl-1.2.2.sh b/sysa/musl-1.2.2/musl-1.2.2.sh index aa723b7..c637b0a 100755 --- a/sysa/musl-1.2.2/musl-1.2.2.sh +++ b/sysa/musl-1.2.2/musl-1.2.2.sh @@ -11,7 +11,10 @@ src_configure() { --includedir=/after/include/ # configure script creates this file - test -f /dev/null && rm /dev/null && mknod -m 666 /dev/null c 1 3 + if test -f /dev/null; then + rm /dev/null + mknod -m 666 /dev/null c 1 3 + fi } src_compile() { diff --git a/sysa/run.sh b/sysa/run.sh index 6f12ec9..8127604 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -12,7 +12,6 @@ set -e populate_device_nodes() { # http://www.linuxfromscratch.org/lfs/view/6.1/chapter06/devices.html - test -c /dev/console || mknod -m 622 /dev/console c 5 1 test -c /dev/null || mknod -m 666 /dev/null c 1 3 test -c /dev/zero || mknod -m 666 /dev/zero c 1 5 test -c /dev/ptmx || mknod -m 666 /dev/ptmx c 5 2