From 37e3f43686d9a82c9709435ad0105ecd21749c41 Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Fri, 14 Jul 2023 12:29:23 -0300
Subject: [PATCH] feat!: new init system using init and entrypoint from device
 tree

---
 Dockerfile                           |  13 ---
 linux/utils/flashdrive               |   4 +-
 skel/opt/cartesi/bin/init            | 127 +++++++++++++--------------
 skel/opt/cartesi/etc/motd            |  11 ---
 skel/opt/cartesi/var/run/random-seed | Bin 4096 -> 0 bytes
 5 files changed, 63 insertions(+), 92 deletions(-)
 delete mode 100644 skel/opt/cartesi/etc/motd
 delete mode 100644 skel/opt/cartesi/var/run/random-seed

diff --git a/Dockerfile b/Dockerfile
index 0f833da3..9109d5ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,18 +45,6 @@ RUN mkdir -p ${BUILD_BASE}linux-sources && \
   make -C ${BUILD_BASE}linux-sources headers_install INSTALL_HDR_PATH=/usr && \
   rm ${BUILD_BASE}${LINUX_SOURCES_FILEPATH}
 
-# copy & extract rndaddentropy
-# ------------------------------------------------------------------------------
-COPY ${RNDADDENTROPY_FILEPATH} ${BUILD_BASE}${RNDADDENTROPY_FILEPATH}
-RUN mkdir -p ${BUILD_BASE}/twuewand && \
-    tar xf ${BUILD_BASE}${RNDADDENTROPY_FILEPATH} \
-      --strip-components=1 -C ${BUILD_BASE}twuewand && \
-    rm ${BUILD_BASE}${RNDADDENTROPY_FILEPATH}
-
-RUN cd ${BUILD_BASE}twuewand/rndaddentropy/ && \
-    make all CFLAGS="-O2 -Wno-error" && \
-    strip rndaddentropy
-
 # copy tools
 COPY linux/ ${BUILD_BASE}tools/linux/
 
@@ -87,7 +75,6 @@ ARG MACHINE_EMULATOR_TOOLS_TAR_GZ=machine-emulator-tools.tar.gz
 
 COPY skel/ ${STAGING_BASE}
 RUN mkdir -p ${STAGING_BIN} && \
-    cp ${BUILD_BASE}twuewand/rndaddentropy/rndaddentropy ${STAGING_BIN} && \
     cp ${BUILD_BASE}tools/linux/xhalt/xhalt ${STAGING_BIN} && \
     cp ${BUILD_BASE}tools/linux/htif/yield ${STAGING_BIN} && \
     cp ${BUILD_BASE}tools/linux/rollup/ioctl-echo-loop/ioctl-echo-loop ${STAGING_BIN} && \
diff --git a/linux/utils/flashdrive b/linux/utils/flashdrive
index e5948cb3..4f217d73 100755
--- a/linux/utils/flashdrive
+++ b/linux/utils/flashdrive
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-for t in /dev/mtdblock*; do
-	name=$(busybox cat /sys/block/$(busybox basename $t)/device/name)
+for t in /dev/pmem*; do
+	name=$(busybox cat /run/drive-label/$(busybox basename $t))
 	if [ "$name" = $1 ]; then
 		echo $t
 		exit 0
diff --git a/skel/opt/cartesi/bin/init b/skel/opt/cartesi/bin/init
index 7995d1ee..a056a0d4 100755
--- a/skel/opt/cartesi/bin/init
+++ b/skel/opt/cartesi/bin/init
@@ -1,85 +1,80 @@
 #!/bin/busybox sh
 
-# Copyright Cartesi and individual authors (see AUTHORS)
-# SPDX-License-Identifier: Apache-2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-export PATH=/opt/cartesi/bin:"$PATH"
-
-[ ! -f /opt/cartesi/etc/motd -o "$splash" == "no" ] || busybox cat /opt/cartesi/etc/motd
-
 # mount
 busybox mkdir -p /dev/pts /dev/shm
-busybox mount -t proc proc /proc -o nosuid,nodev,noexec
-busybox mount -t sysfs sys /sys -o nosuid,nodev,noexec
-busybox mount -t devpts devpts /dev/pts -o nosuid,noexec,gid=5,mode=620
-busybox mount -t tmpfs tmpfs /dev/shm -o nosuid,nodev,mode=1777
-#busybox mdev -s
+busybox mount -o nosuid,nodev,noexec          -t proc proc /proc
+busybox mount -o nosuid,noexec,mode=620,gid=5 -t devpts devpts /dev/pts
+busybox mount -o nosuid,nodev,mode=1777       -t tmpfs tmpfs /dev/shm
+busybox mount -o nosuid,nodev,noexec          -t sysfs sys /sys
+[ -d /tmp ] && busybox mount -o nosuid,nodev,mode=1777 -t tmpfs tmpfs /tmp
+[ -d /run ] && busybox mount -o nosuid,nodev,mode=0755 -t tmpfs tmpfs /run
 
-# rand
-if [ -f /opt/cartesi/var/run/random-seed ]; then
-    rndaddentropy < /opt/cartesi/var/run/random-seed
-    busybox chmod 600 /opt/cartesi/var/run/random-seed
-fi
-
-# disk
-if [ -d /mnt ]; then
-    (cd /sys/block && for DEV in *; do
-        [ ! "$DEV" = "mtdblock0" ] && \
-        NAME=$(busybox cat /sys/block/"$DEV"/device/name) && \
-        busybox mkdir "/mnt/$NAME" && \
-        busybox mount "/dev/$DEV" "/mnt/$NAME"
-    done)
-fi
+# system config
+[ -f /etc/sysctl.conf ] && busybox sysctl -pq
 
 # net
 [ -f /etc/hostname ] && busybox hostname -F /etc/hostname
-busybox ifconfig lo 127.0.0.1
+[ -z "$noloopback" ] && busybox ifconfig lo up
 
-# cmdline application
-if [ -n "$*" ]; then
-    [ -f /etc/environment ] && \
-        source /etc/environment && \
-        export PATH=/opt/cartesi/bin:"$PATH" # put it back on PATH
+# source environment
+[ -f /etc/environment ] && . /etc/environment
+export PATH="$PATH:/opt/cartesi/bin"
 
-    # can login as dapp user?
-    if [ ! "$single" == "yes" ] && busybox id dapp &> /dev/null; then
-        if [ -c /dev/rollup ]; then
-            busybox chown root:dapp /dev/rollup
-            busybox chmod 660 /dev/rollup
-        fi
-        if [ -c /dev/yield ]; then
-            busybox chown root:dapp /dev/yield
-            busybox chmod 660 /dev/yield
-        fi
-        export HOME=~dapp USER=dapp LOGNAME=dapp
-    else
-        export HOME=~root USER=root LOGNAME=root
-    fi
+# execute init from device tree when available
+[ -f /proc/device-tree/cartesi-machine/init ] && . /proc/device-tree/cartesi-machine/init
 
-    # execute cmdline
-    cd $HOME &&
+# use entrypoint from device tree when available, otherwise from command line
+if [ -s /proc/device-tree/cartesi-machine/entrypoint ]; then
+    ENTRYPOINT=$(busybox cat /proc/device-tree/cartesi-machine/entrypoint)
+elif [ -n "$*" ]; then
+    ENTRYPOINT="$*"
+fi
+
+# is entrypoint not empty?
+if [ -n "$ENTRYPOINT" ]; then
+    USER=${USER:-root}
+    HOME=$(eval echo ~$USER)
+    WORKDIR=${WORKDIR:-"$HOME"}
+
+    # give user group access to rollup and yield devices
+    [ -c /dev/rollup ] && \
+        busybox chown :$(busybox id -g $USER) /dev/rollup && \
+        busybox chmod g+rw /dev/rollup
+    [ -c /dev/yield ] &&
+        busybox chown :$(busybox id -g $USER) /dev/yield && \
+        busybox chmod g+rw /dev/yield
+
+    # execute entrypoint
+    (cd $WORKDIR &&
+        USER=$USER LOGNAME=$USER HOME="$HOME" \
         busybox setsid \
         busybox cttyhack \
-        busybox su -p $USER -c "$*"
-    RC=$?
+        busybox su -p $USER -c "$ENTRYPOINT")
 else
     echo "Nothing to do."
-    RC=0
 fi
+RC=$?
 
+# shutdown
 busybox mount -o ro,remount /
 busybox umount -af
-[ $RC == 0 ] && busybox poweroff -f || xhalt "$RC"
+if [ $RC != 0 ] && [ -x /opt/cartesi/bin/xhalt ]; then
+    /opt/cartesi/bin/xhalt "$RC"
+fi
+busybox poweroff -f
+
+# Copyright Cartesi and individual authors (see AUTHORS)
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
\ No newline at end of file
diff --git a/skel/opt/cartesi/etc/motd b/skel/opt/cartesi/etc/motd
deleted file mode 100644
index b4a952fb..00000000
--- a/skel/opt/cartesi/etc/motd
+++ /dev/null
@@ -1,11 +0,0 @@
-
-         .
-        / \
-      /    \
-\---/---\  /----\
- \       X       \
-  \----/  \---/---\
-       \    / CARTESI
-        \ /   MACHINE
-         '
-
diff --git a/skel/opt/cartesi/var/run/random-seed b/skel/opt/cartesi/var/run/random-seed
deleted file mode 100644
index ccc19588fe6a87786fa38ec72c6390c652364817..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
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