From: longpanda Date: Fri, 24 Mar 2023 12:43:47 +0000 (+0800) Subject: Add support for chimera linux. (#2309) X-Git-Tag: v1.0.90~3 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/e743f7c15fdf32c7b32e9c00622fe3c0dbb6eaca 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 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 +# +# 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 . +# +#************************************************************************************ + +. /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 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 +# +# 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 . +# +#************************************************************************************ + +. $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 fbde4c8..ba76620 100644 --- a/IMG/cpio/ventoy/ventoy_chain.sh +++ b/IMG/cpio/ventoy/ventoy_chain.sh @@ -369,6 +369,9 @@ ventoy_get_os_type() { fi fi + if $GREP -q 'chimera' /proc/version; then + echo 'chimera'; return + fi echo "default" } diff --git a/INSTALL/grub/grub.cfg b/INSTALL/grub/grub.cfg index 8389ab1..6d6c8de 100644 --- 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 + elif [ -f (loop)/live/initrd ]; then + vt_linux_specify_initrd_file /live/initrd fi }