live-bootstrap

commit: fdec1c0380ea9bf1a874bc3ab5bc75d863c0992b
parent 3bf5d4152d4d59ee4d420381d2c7d03fda8db339
Author: Andrius Štikonas <andrius@stikonas.eu>
Date:   Wed, 31 Mar 2021 18:12:09 +0100

Merge pull request #81 from bauen1/remove-dev-console

Remove dev console
Diffstat:
M
.cirrus.yml
4
++--
M
sysa/musl-1.1.24/binutils-rebuild.sh
4
+++-
M
sysa/musl-1.1.24/musl-1.1.24.sh
4
+++-
M
sysa/musl-1.2.2/musl-1.2.2.sh
5
++++-
M
sysa/run.sh
1
-

5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -45,12 +45,12 @@ run_task:
   deps_script:
     - apt-get -y update
     - apt-get -y dist-upgrade
-    - apt-get -y install sudo git cpio linux-image-4.19.0-13-amd64 expect wget
+    - apt-get -y install sudo git cpio linux-image-4.19.0-16-amd64 expect wget
     - apt-get -y clean
   submodule_script:
     - git submodule update --init --recursive
   kernel_script:
-    - cp /boot/vmlinuz-4.19.0-13-amd64 ./kernel
+    - cp /boot/vmlinuz-4.19.0-16-amd64 ./kernel
   run_script:
     - ./.cirrus.expect | tee -a /tmp/run.log
     - grep -q 'Bootstrapping completed.' /tmp/run.log
diff --git 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
@@ -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
@@ -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
@@ -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