From 24b05c034500bc03dbd001a61932f4c54c158f26 Mon Sep 17 00:00:00 2001 From: longpanda Date: Mon, 27 Jun 2022 09:23:34 +0800 Subject: [PATCH] Fix the bug when booting latest KaOS. (#1696) --- IMG/cpio/ventoy/hook/kaos/udev_disk_hook.sh | 39 ------- IMG/cpio/ventoy/hook/kaos/ventoy-disk.sh | 117 ++++++++++++++++++++ IMG/cpio/ventoy/hook/kaos/ventoy-hook.sh | 13 ++- 3 files changed, 128 insertions(+), 41 deletions(-) delete mode 100644 IMG/cpio/ventoy/hook/kaos/udev_disk_hook.sh create mode 100644 IMG/cpio/ventoy/hook/kaos/ventoy-disk.sh diff --git a/IMG/cpio/ventoy/hook/kaos/udev_disk_hook.sh b/IMG/cpio/ventoy/hook/kaos/udev_disk_hook.sh deleted file mode 100644 index 08ee2680..00000000 --- a/IMG/cpio/ventoy/hook/kaos/udev_disk_hook.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/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 - -if is_ventoy_hook_finished || not_ventoy_disk "${1:0:-1}"; then - exit 0 -fi - -VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH - -modprobe fuse -mkdir -p $VTOY_PATH/mnt/fuse $VTOY_PATH/mnt/iso - -vtoydm -p -f $VTOY_PATH/ventoy_image_map -d "/dev/${1:0:-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 - -# OK finish -set_ventoy_hook_finish - -PATH=$VTPATH_OLD - diff --git a/IMG/cpio/ventoy/hook/kaos/ventoy-disk.sh b/IMG/cpio/ventoy/hook/kaos/ventoy-disk.sh new file mode 100644 index 00000000..c21c04c9 --- /dev/null +++ b/IMG/cpio/ventoy/hook/kaos/ventoy-disk.sh @@ -0,0 +1,117 @@ +#!/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 + +vtlog "######### $0 $* ############" + +VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH + + +ventoy_os_install_dmsetup_by_fuse() { + vtlog "ventoy_os_install_dmsetup_by_fuse $*" + + mkdir -p $VTOY_PATH/mnt/fuse $VTOY_PATH/mnt/iso $VTOY_PATH/mnt/squashfs + + 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 + + sfsfile=$VTOY_PATH/mnt/iso/kdeos/x86_64/root-image.sqfs + + mount -t squashfs $sfsfile $VTOY_PATH/mnt/squashfs + + kVer=$(uname -r) + KoName=$(ls $VTOY_PATH/mnt/squashfs/lib/modules/$kVer/kernel/drivers/md/dm-mod.ko*) + vtlog "insmod $KoName" + + if echo $KoName | grep -q '\.zst'; then + zstdcat $KoName > $VTOY_PATH/dm-mod.ko + insmod $VTOY_PATH/dm-mod.ko + else + insmod $KoName + fi + + umount $VTOY_PATH/mnt/squashfs + umount $VTOY_PATH/mnt/iso + umount $VTOY_PATH/mnt/fuse +} + + +if is_ventoy_hook_finished; then + exit 0 +fi + +wait_for_usb_disk_ready + +vtdiskname=$(get_ventoy_disk_name) +if [ "$vtdiskname" = "unknown" ]; then + vtlog "ventoy disk not found" + exit 0 +fi + +if grep -q 'device-mapper' /proc/devices; then + vtlog "device-mapper module exist" +else + ventoy_os_install_dmsetup_by_fuse $vtdiskname +fi + +ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace" + +blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/') +vtDM=$(ventoy_find_dm_id ${blkdev_num}) +vtlog "blkdev_num=$blkdev_num vtDM=$vtDM ..." + +while [ -n "Y" ]; do + if [ -b /dev/$vtDM ]; then + break + else + sleep 0.3 + fi +done + +if [ -n "$1" ]; then + vtlog "ln -s /dev/$vtDM $1" + + if [ -e "$1" ]; then + vtlog "$1 already exist" + else + ln -s /dev/$vtDM "$1" + fi +else + vtLABEL=$($BUSYBOX_PATH/blkid /dev/$vtDM | $SED 's/.*LABEL="\([^"]*\)".*/\1/') + vtlog "vtLABEL is $vtLABEL" + + if [ -z "$vtLABEL" ]; then + vtLABEL=$($SED "s/.*label=\([^ ]*\)/\1/" /proc/cmdline) + vtlog "vtLABEL is $vtLABEL from cmdline" + fi + + if [ -e "/dev/disk/by-label/$vtLABEL" ]; then + vtlog "$1 already exist" + else + ln -s /dev/$vtDM "/dev/disk/by-label/$vtLABEL" + fi +fi + +PATH=$VTPATH_OLD + +# OK finish +set_ventoy_hook_finish diff --git a/IMG/cpio/ventoy/hook/kaos/ventoy-hook.sh b/IMG/cpio/ventoy/hook/kaos/ventoy-hook.sh index c268801a..84aadc03 100644 --- a/IMG/cpio/ventoy/hook/kaos/ventoy-hook.sh +++ b/IMG/cpio/ventoy/hook/kaos/ventoy-hook.sh @@ -2,5 +2,14 @@ . $VTOY_PATH/hook/ventoy-os-lib.sh -ventoy_systemd_udevd_work_around -ventoy_add_udev_rule "$VTOY_PATH/hook/kaos/udev_disk_hook.sh %k" +if $GREP -q '^"$mount_handler"' /init; then + echo 'use mount_handler1 ...' >> $VTLOG + $SED "/^\"\$mount_handler\"/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/kaos/ventoy-disk.sh" -i /init +elif $GREP -q '^$mount_handler' /init; then + echo 'use mount_handler2 ...' >> $VTLOG + $SED "/^\$mount_handler/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/kaos/ventoy-disk.sh" -i /init +fi + +if [ -f $VTOY_PATH/ventoy_persistent_map ]; then + $SED "1 aexport cow_label=vtoycow" -i /init +fi