mirror of
https://github.com/ventoy/Ventoy.git
synced 2025-01-26 22:23:21 -05:00
1.0.20 release
This commit is contained in:
parent
8dce0adda6
commit
d678e54956
@ -1318,7 +1318,7 @@ static int ventoy_dynamic_tree_menu(img_iterator_node *node)
|
|||||||
" %s_%s \n"
|
" %s_%s \n"
|
||||||
"}\n",
|
"}\n",
|
||||||
grub_get_human_size(img->size, GRUB_HUMAN_SIZE_SHORT),
|
grub_get_human_size(img->size, GRUB_HUMAN_SIZE_SHORT),
|
||||||
img->unsupport ? "[unsupported] " : "",
|
img->unsupport ? "[***********] " : "",
|
||||||
img->alias ? img->alias : img->name, img->class, img->id,
|
img->alias ? img->alias : img->name, img->class, img->id,
|
||||||
img->menu_prefix,
|
img->menu_prefix,
|
||||||
img->unsupport ? "unsupport_menuentry" : "common_menuentry");
|
img->unsupport ? "unsupport_menuentry" : "common_menuentry");
|
||||||
@ -1474,7 +1474,7 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
|
|||||||
"menuentry \"%s%s\" --class=\"%s\" --id=\"VID_%d\" {\n"
|
"menuentry \"%s%s\" --class=\"%s\" --id=\"VID_%d\" {\n"
|
||||||
" %s_%s \n"
|
" %s_%s \n"
|
||||||
"}\n",
|
"}\n",
|
||||||
cur->unsupport ? "[unsupported] " : "",
|
cur->unsupport ? "[***********] " : "",
|
||||||
cur->alias ? cur->alias : cur->name, cur->class, cur->id,
|
cur->alias ? cur->alias : cur->name, cur->class, cur->id,
|
||||||
cur->menu_prefix,
|
cur->menu_prefix,
|
||||||
cur->unsupport ? "unsupport_menuentry" : "common_menuentry");
|
cur->unsupport ? "unsupport_menuentry" : "common_menuentry");
|
||||||
|
25
IMG/cpio/ventoy/hook/blackPanther/ventoy-hook.sh
Normal file
25
IMG/cpio/ventoy/hook/blackPanther/ventoy-hook.sh
Normal file
@ -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/>.
|
||||||
|
#
|
||||||
|
#************************************************************************************
|
||||||
|
|
||||||
|
. $VTOY_PATH/hook/ventoy-os-lib.sh
|
||||||
|
|
||||||
|
ventoy_set_inotify_script blackPanther/ventoy-inotifyd-hook.sh
|
||||||
|
$BUSYBOX_PATH/cp -a $VTOY_PATH/hook/blackPanther/ventoy-inotifyd-start.sh /lib/dracut/hooks/pre-udev/00-ventoy-inotifyd-start.sh
|
||||||
|
|
||||||
|
$SED "s#printf\(.*\)\$CMDLINE#printf\1 root=/dev/dm-0 \$CMDLINE root=/dev/dm-0#" -i /lib/dracut-lib.sh
|
46
IMG/cpio/ventoy/hook/blackPanther/ventoy-inotifyd-hook.sh
Normal file
46
IMG/cpio/ventoy/hook/blackPanther/ventoy-inotifyd-hook.sh
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
#!/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
|
||||||
|
|
||||||
|
if is_ventoy_hook_finished; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
|
||||||
|
|
||||||
|
if is_inotify_ventoy_part $3; then
|
||||||
|
|
||||||
|
vtlog "##### INOTIFYD: $2/$3 is created (YES) ..."
|
||||||
|
|
||||||
|
vtlog "find ventoy partition ..."
|
||||||
|
$BUSYBOX_PATH/sh $VTOY_PATH/hook/default/udev_disk_hook.sh $3 noreplace
|
||||||
|
|
||||||
|
blkdev_num_dev=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1 \2/')
|
||||||
|
if ! [ -e /dev/dm-0 ]; then
|
||||||
|
mknod -m 660 /dev/dm-0 b $blkdev_num_dev
|
||||||
|
fi
|
||||||
|
blackPanther-root /dev/dm-0
|
||||||
|
|
||||||
|
set_ventoy_hook_finish
|
||||||
|
else
|
||||||
|
vtlog "##### INOTIFYD: $2/$3 is created (NO) ..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
PATH=$VTPATH_OLD
|
32
IMG/cpio/ventoy/hook/blackPanther/ventoy-inotifyd-start.sh
Normal file
32
IMG/cpio/ventoy/hook/blackPanther/ventoy-inotifyd-start.sh
Normal file
@ -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
|
||||||
|
|
||||||
|
vtHook=$($CAT $VTOY_PATH/inotifyd-hook-script.txt)
|
||||||
|
|
||||||
|
vtdisk=$(get_ventoy_disk_name)
|
||||||
|
if [ "$vtdisk" = "unknown" ]; then
|
||||||
|
vtlog "... start inotifyd listen $vtHook ..."
|
||||||
|
$BUSYBOX_PATH/nohup $VTOY_PATH/tool/inotifyd $vtHook /dev:n 2>&- &
|
||||||
|
else
|
||||||
|
vtlog "... $vtdisk already exist ..."
|
||||||
|
$BUSYBOX_PATH/sh $vtHook n /dev "${vtdisk#/dev/}2"
|
||||||
|
fi
|
||||||
|
|
@ -301,6 +301,10 @@ ventoy_get_os_type() {
|
|||||||
echo 'pisilinux'; return
|
echo 'pisilinux'; return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if $GREP -q 'blackPanther' /proc/version; then
|
||||||
|
echo 'blackPanther'; return
|
||||||
|
fi
|
||||||
|
|
||||||
echo "default"
|
echo "default"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -3,6 +3,7 @@
|
|||||||
. ./tool/ventoy_lib.sh
|
. ./tool/ventoy_lib.sh
|
||||||
|
|
||||||
print_usage() {
|
print_usage() {
|
||||||
|
|
||||||
echo 'Usage: Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX'
|
echo 'Usage: Ventoy2Disk.sh CMD [ OPTION ] /dev/sdX'
|
||||||
echo ' CMD:'
|
echo ' CMD:'
|
||||||
echo ' -i install ventoy to sdX (fail if disk already installed with ventoy)'
|
echo ' -i install ventoy to sdX (fail if disk already installed with ventoy)'
|
||||||
@ -33,6 +34,11 @@ while [ -n "$1" ]; do
|
|||||||
RESERVE_SPACE="YES"
|
RESERVE_SPACE="YES"
|
||||||
shift
|
shift
|
||||||
RESERVE_SIZE_MB=$1
|
RESERVE_SIZE_MB=$1
|
||||||
|
elif [ "$1" = "-V" ] || [ "$1" = "--version" ]; then
|
||||||
|
exit 0
|
||||||
|
elif [ "$1" == "-h" ] || [ "$1" = "--help" ]; then
|
||||||
|
print_usage
|
||||||
|
exit 0
|
||||||
else
|
else
|
||||||
if ! [ -b "$1" ]; then
|
if ! [ -b "$1" ]; then
|
||||||
vterr "$1 is NOT a valid device"
|
vterr "$1 is NOT a valid device"
|
||||||
@ -180,7 +186,7 @@ if [ "$MODE" = "install" ]; then
|
|||||||
vtwarn "All the data on the disk $DISK will be lost!!!"
|
vtwarn "All the data on the disk $DISK will be lost!!!"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
read -p 'Continue? (y/n)' Answer
|
read -p 'Continue? (y/n) ' Answer
|
||||||
if [ "$Answer" != "y" ]; then
|
if [ "$Answer" != "y" ]; then
|
||||||
if [ "$Answer" != "Y" ]; then
|
if [ "$Answer" != "Y" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
@ -189,7 +195,7 @@ if [ "$MODE" = "install" ]; then
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
vtwarn "All the data on the disk $DISK will be lost!!!"
|
vtwarn "All the data on the disk $DISK will be lost!!!"
|
||||||
read -p 'Double-check. Continue? (y/n)' Answer
|
read -p 'Double-check. Continue? (y/n) ' Answer
|
||||||
if [ "$Answer" != "y" ]; then
|
if [ "$Answer" != "y" ]; then
|
||||||
if [ "$Answer" != "Y" ]; then
|
if [ "$Answer" != "Y" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user