Fix the boot issue for TrueNAS Scale. (#3069)

diff --git a/IMG/cpio/ventoy/hook/debian/truenas-bottom.sh b/IMG/cpio/ventoy/hook/debian/truenas-bottom.sh
new file mode 100644 (file)
index 0000000..0fb7df3
--- /dev/null
+++ b/IMG/cpio/ventoy/hook/debian/truenas-bottom.sh
@@ -0,0 +1,25 @@
+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+vtlog "mount ventoy.iso"
+mkdir -p /root/cdrom  >>$VTLOG 2>&1
+mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    /root/cdrom    >>$VTLOG 2>&1
+

diff --git a/IMG/cpio/ventoy/hook/debian/truenas-disk.sh b/IMG/cpio/ventoy/hook/debian/truenas-disk.sh
index 3a5aaddc7dbb5f21fbe0225730266653a8170bfe..7deda5752636dc4f78356e98e43e046023e221f6 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/truenas-disk.sh
+++ b/IMG/cpio/ventoy/hook/debian/truenas-disk.sh
@@ -27,12 +27,12 @@ VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
 ventoy_run_fuse() {
     vtlog "ventoy_run_fuse $*"
 
 ventoy_run_fuse() {
     vtlog "ventoy_run_fuse $*"
 

-    mkdir -p $VTOY_PATH/mnt/fuse
+    mkdir -p $VTOY_PATH/mnt/fuse  $VTOY_PATH/mnt/iso

 
     vtoydm -p -f $VTOY_PATH/ventoy_image_map -d $1 > $VTOY_PATH/ventoy_dm_table
     vtoy_fuse_iso -f $VTOY_PATH/ventoy_dm_table -m $VTOY_PATH/mnt/fuse
 
     vtoydm -p -f $VTOY_PATH/ventoy_image_map -d $1 > $VTOY_PATH/ventoy_dm_table
     vtoy_fuse_iso -f $VTOY_PATH/ventoy_dm_table -m $VTOY_PATH/mnt/fuse

-
-    mount -t iso9660  $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso
+    
+    mount -t iso9660 $VTOY_PATH/mnt/fuse/ventoy.iso    $VTOY_PATH/mnt/iso

 }
 
 
 }
 
 

diff --git a/IMG/cpio/ventoy/hook/debian/truenas-hook.sh b/IMG/cpio/ventoy/hook/debian/truenas-hook.sh
index 6a56a8e6748e0a425ef07d0e68ba2877a5c96d82..d7d90f47f17ddd08f502803fb586801e1e5b2420 100644 (file)
--- a/IMG/cpio/ventoy/hook/debian/truenas-hook.sh
+++ b/IMG/cpio/ventoy/hook/debian/truenas-hook.sh
@@ -23,4 +23,5 @@ if [ -e /init ] && $GREP -q '^mountroot$' /init; then
     $SED  "/^mountroot$/i\\export LIVEMEDIA=/dev/mapper/ventoy"  -i /init
     $SED  "/^mountroot$/i\\export LIVE_MEDIA=/dev/mapper/ventoy"  -i /init    
     $SED  "/^mountroot$/i\\export FROMISO=$VTOY_PATH/mnt/fuse/ventoy.iso"  -i /init    
     $SED  "/^mountroot$/i\\export LIVEMEDIA=/dev/mapper/ventoy"  -i /init
     $SED  "/^mountroot$/i\\export LIVE_MEDIA=/dev/mapper/ventoy"  -i /init    
     $SED  "/^mountroot$/i\\export FROMISO=$VTOY_PATH/mnt/fuse/ventoy.iso"  -i /init    

+    $SED  "/exec  *run-init/i\\$BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/truenas-bottom.sh"  -i /init

 fi
 fi