expand test

additionalFiles/initRock.sh

@@ -47,8 +47,9 @@ fi
 
 if [[ -f "/boot/openhd/rock-rk3566.txt" ]]; then
     echo "Running on a rk3566 "
-    (pv -n /dev/mmcblk1 | dd of=/dev/mmcblk0 bs=128M conv=notrunc,noerror) 2>&1 | dialog --gauge "Running dd command (cloning), please wait..." 10 70 0
+    (pv -n /dev/mmcblk1 | dd of=/dev/mmcblk0 bs=128M conv=notrunc,noerror) 2>&1 | whiptail --gauge "Running dd command (cloning), please wait..." 10 70 0
     mkdir -p /usr/local/share/openhd/platform/rock/rk3566
+    touch /boot/openhd/IExecuted
     config_file=$(find /boot/openhd/ -type f -name 'IMX*')
 
     if [[ -n "$config_file" ]]; then

additionalFiles/openhd_sys_utils.service

@@ -6,4 +6,4 @@ Type=simple
 ExecStart=/bin/bash /usr/local/bin/openhd_sys_utils.sh
 
 [Install]
-WantedBy=basic.target
+WantedBy=simple.target

additionalFiles/openhd_sys_utils.sh

@@ -30,9 +30,9 @@ if [ -f "/boot/openhd/rock-5b.txt" ]; then
   rm /boot/openhd/rock-5b.txt
 fi
 
-if [ -f "/boot/openhd/rk3566.txt" ]; then
+if [ -f "/boot/openhd/rock-rk3566.txt" ]; then
   sudo bash /usr/local/bin/initRock.sh
-  rm /boot/openhd/rk3566.txt
+  rm /boot/openhd/rock-rk3566.txt
 fi
 
 if [ -f "/boot/openhd/rpi.txt" ]; then
@@ -41,3 +41,4 @@ if [ -f "/boot/openhd/rpi.txt" ]; then
   rm /boot/openhd/rpi.txt
   fi
 fi
+touch /boot/openhd/IRan.txt

stages/03-Preconfiguration/00-run-chroot.sh

@@ -17,17 +17,19 @@ if [[ "${OS}" == "radxa-debian-rock5a" ]] || [[ "${OS}" == "radxa-debian-rock5b"
     cat /etc/fstab
     #rm /conf/before.txt
     cp /opt/additionalFiles/before.txt /conf/before.txt
+    cp /opt/additionalFiles/before.txt /config/before.txt
     #allow offline auto detection of image format
     cp /opt/additionalFiles/issue.txt /conf/issue.txt
+    cp /opt/additionalFiles/issue.txt /config/issue.txt
     mkdir -p /conf/openhd
+    mkdir -p /config/openhd
     mkdir -p /boot/openhd
     cp /opt/additionalFiles/initRock.sh /usr/local/bin/initRock.sh
     touch /conf/config.txt
+    touch /config/config.txt
     #mounting config partition
-    ls -a /conf
-    echo "_________"
-    ls -a /config
     cp -rv /boot/openhd/* /conf/openhd/
+    cp -rv /boot/openhd/* /config/openhd/
     #rm -Rf /boot/openhd
     ln -s /config/openhd /boot/openhd
     #copy overlays from linux kernel into the correct folder

stages/03-Preconfiguration/01-run-chroot.sh

@@ -49,6 +49,9 @@ sudo systemctl disable rsync
 sudo systemctl disable systemd-journald.service
 fi
 
+if [[ "${OS}" == "radxa-debian-rock-cm3" ]]; then
+sudo systemctl disable rsetup
+
 #disable network-logging
 sudo systemctl disable syslog.service