Add support for chimera linux. (#2309)

diff --git a/IMG/cpio/ventoy/hook/chimera/disk_hook.sh b/IMG/cpio/ventoy/hook/chimera/disk_hook.sh
new file mode 100644 (file)
index 0000000..5cb1f23
--- /dev/null
+++ b/IMG/cpio/ventoy/hook/chimera/disk_hook.sh
@@ -0,0 +1,32 @@
+#!/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
+
+for i in 0 1 2 3 4 5 6 7 8 9; do 
+    vtdiskname=$(get_ventoy_disk_name)
+    if [ "$vtdiskname" = "unknown" ]; then
+        vtlog "wait for disk ..."
+        $SLEEP 3
+    else
+        break
+    fi
+done
+
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2"

diff --git a/IMG/cpio/ventoy/hook/chimera/ventoy-hook.sh b/IMG/cpio/ventoy/hook/chimera/ventoy-hook.sh
new file mode 100644 (file)
index 0000000..a138088
--- /dev/null
+++ b/IMG/cpio/ventoy/hook/chimera/ventoy-hook.sh
@@ -0,0 +1,22 @@
+#!/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/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+$SED "/maybe_break *premount/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/chimera/disk_hook.sh"  -i /init    

diff --git a/IMG/cpio/ventoy/ventoy_chain.sh b/IMG/cpio/ventoy/ventoy_chain.sh
index fbde4c87b95b37d7d56faea3399239572c773267..ba766201c47af91950cd44e6399979c2ee4d1633 100644 (file)
--- a/IMG/cpio/ventoy/ventoy_chain.sh
+++ b/IMG/cpio/ventoy/ventoy_chain.sh
@@ -369,6 +369,9 @@ ventoy_get_os_type() {
         fi
     fi
     
         fi
     fi
     

+    if $GREP -q 'chimera' /proc/version; then
+        echo 'chimera'; return
+    fi

     
     echo "default"
 }
     
     echo "default"
 }

diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg
index 8389ab1cbcd1e8657b013d3bccdfaf338a3ad8be..6d6c8de1f96bf3da84661abc2039d2bf005d136d 100644 (file)
--- a/INSTALL/grub/grub.cfg
+++ b/INSTALL/grub/grub.cfg
@@ -401,6 +401,8 @@ function distro_specify_initrd_file_phase2 {
         vt_linux_specify_initrd_file /boot/full.cz
     elif [ -f (loop)/images/pxeboot/initrd.img ]; then
         vt_linux_specify_initrd_file /images/pxeboot/initrd.img
         vt_linux_specify_initrd_file /boot/full.cz
     elif [ -f (loop)/images/pxeboot/initrd.img ]; then
         vt_linux_specify_initrd_file /images/pxeboot/initrd.img

+    elif [ -f (loop)/live/initrd ]; then
+        vt_linux_specify_initrd_file /live/initrd

 
     fi
 }
 
     fi
 }