1.0.33 release

This commit is contained in:
longpanda
2021-01-21 15:40:50 +08:00
parent 8632e56561
commit a129996756
7 changed files with 15 additions and 103 deletions

View File

@@ -1,58 +0,0 @@
#!/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
vtlog "####### $0 $* ########"
VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
wait_for_usb_disk_ready
vtdiskname=$(get_ventoy_disk_name)
if [ "$vtdiskname" = "unknown" ]; then
vtlog "ventoy disk not found"
PATH=$VTPATH_OLD
exit 0
fi
vtlog "fuse $*"
mkdir -p $VTOY_PATH/mnt/fuse $VTOY_PATH/mnt/iso
vtoydm -p -f $VTOY_PATH/ventoy_image_map -d $vtdiskname > $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
rm -f /puppy.sfs
echo -e "\n\\033[1;35mCopying to ram ...\\033[0;39m" > /dev/console
[ -d $VTOY_PATH/mnt/iso/360Disk ] && cp -a $VTOY_PATH/mnt/iso/360Disk $VTOY_PATH/
[ -e $VTOY_PATH/360Disk/puppy.sfs ] && mv $VTOY_PATH/360Disk/puppy.sfs /puppy.sfs
umount $VTOY_PATH/mnt/iso
umount $VTOY_PATH/mnt/fuse
PATH=$VTPATH_OLD
set_ventoy_hook_finish

View File

@@ -1,29 +0,0 @@
#!/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
VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
mkdir -p /pup_new/mnt/sdz
mv $VTOY_PATH/360Disk /pup_new/mnt/sdz/
[ -f /pup_new/root/scripts/cd_plugin ] && echo "/root/scripts/cd_plugin sdz" >> /pup_new/etc/rc.d/rc.local
PATH=$VTPATH_OLD

View File

@@ -17,18 +17,9 @@
#
#************************************************************************************
if $GREP -q '^ *HAVE_PARTS=' /init; then
$SED '1 apmedia=usbhd' -i /init
$SED "/^ *HAVE_PARTS=/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/puppy-disk.sh" -i /init
$SED "/^ *HAVE_PARTS=/a\ HAVE_PARTS='ventoy|iso9660'" -i /init
fi
#360UDisk
if [ -e /360anim ]; then
$BUSYBOX_PATH/touch /puppy.sfs
$SED "/if *.*flag-usb-ready/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/360-disk.sh" -i /init
$SED "/^exec *switch_root/i\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/360-switch-root.sh" -i /init
fi
$SED '1 apmedia=usbhd' -i /init
$SED "/^ *HAVE_PARTS=/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/puppy-disk.sh" -i /init
$SED "/^ *HAVE_PARTS=/a\ HAVE_PARTS='ventoy|iso9660'" -i /init
if [ -f /DISTRO_SPECS ]; then
if ! [ -d /dev ]; then