support for 360Udisk

FUSEISO/build.sh

@@ -12,13 +12,15 @@ else
 fi
 
 #
-# use mini-native-x86_64 UCLIBC to build for x86_64
+# use musl-c to build for x86_64
 #
 
 export C_INCLUDE_PATH=$LIBFUSE_DIR/include
 
 rm -f $name
-gcc -static -O2 -D_FILE_OFFSET_BITS=64  vtoy_fuse_iso.c -o $name $LIBFUSE_DIR/lib/libfuse.a  -lpthread -ldl $opt
+gcc -specs "/usr/local/musl/lib/musl-gcc.specs" -static -O2 -D_FILE_OFFSET_BITS=64  vtoy_fuse_iso.c $LIBFUSE_DIR/lib/libfuse.a  -o  $name
+
+strip --strip-all $name
 
 if [ -e $name ]; then
    echo -e "\n############### SUCCESS $name ##################\n"

FUSEISO/build_libfuse.sh

@@ -33,7 +33,7 @@ fi
 
 ./makeconf.sh
 
-./configure --prefix="$LIBFUSE_DIR"
+./configure --prefix="$LIBFUSE_DIR" CFLAGS='-specs /usr/local/musl/lib/musl-gcc.specs'
 make -j 16
 make install
 cd ..

GRUB2/MOD_SRC/grub-2.04/grub-core/fs/iso9660.c

@@ -735,6 +735,8 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 	  {
 	    if ((dirent.flags & FLAG_TYPE) == FLAG_TYPE_DIR)
 	      ctx.type = GRUB_FSHELP_DIR;
+        else if ((dirent.flags & FLAG_TYPE) == 3)
+          ctx.type = GRUB_FSHELP_DIR;
 	    else
 	      ctx.type = GRUB_FSHELP_REG;
 	  }

IMG/cpio/ventoy/hook/debian/360-disk.sh

+#!/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
+[ -e $VTOY_PATH/mnt/iso/360Disk/puppy.sfs ] && cp -a $VTOY_PATH/mnt/iso/360Disk/puppy.sfs /puppy.sfs
+[ -d $VTOY_PATH/mnt/iso/360Disk/addsw ] && cp -a $VTOY_PATH/mnt/iso/360Disk/addsw /
+
+umount $VTOY_PATH/mnt/iso
+umount $VTOY_PATH/mnt/fuse
+
+PATH=$VTPATH_OLD
+
+set_ventoy_hook_finish

IMG/cpio/ventoy/hook/debian/360-switch-root.sh

+#!/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
+
+
+PATH=$VTPATH_OLD
+
+set_ventoy_hook_finish

IMG/cpio/ventoy/hook/debian/puppy-hook.sh

@@ -17,9 +17,18 @@
 # 
 #************************************************************************************
 
-$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 $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
 
 if [ -f /DISTRO_SPECS ]; then
     if ! [ -d /dev ]; then

INSTALL/grub/grub.cfg

@@ -294,6 +294,8 @@ function distro_specify_initrd_file_phase2 {
         fi
     elif [ -f (loop)/antiX/initrd.gz ]; then
         vt_linux_specify_initrd_file /antiX/initrd.gz
+    elif [ -f (loop)/360Disk/initrd.gz ]; then
+        vt_linux_specify_initrd_file /360Disk/initrd.gz
     
     fi
 }

KBD/cfg/KBD_AZERTY.cfg

+# set AZERTY keyboard generic
+#clear all settings
+setkey -r
+#setkey [new character] [QWERTY-USA character]
+setkey a q 
+setkey A Q 
+setkey z w 
+setkey Z W 
+setkey q a 
+setkey Q A 
+setkey m semicolon 
+setkey M colon 
+setkey w z 
+setkey W Z 
+setkey comma m 
+setkey question M 
+setkey semicolon comma 
+setkey period less 
+setkey colon period 
+setkey slash greater 
+setkey exclam slash 
+setkey dollar bracketright 
+setkey asterisk backslash 
+setkey percent doublequote 
+setkey ampersand 1 
+setkey 1 exclam 
+setkey tilde 2 
+setkey 2 at 
+setkey doublequote 3 
+setkey 3 numbersign 
+setkey quote 4 
+setkey 4 dollar 
+setkey parenleft 5 
+setkey 5 percent 
+setkey minus 6 
+setkey 6 caret 
+setkey backquote 7 
+setkey 7 ampersand 
+setkey underscore 8 
+setkey 8 asterisk 
+setkey caret 9 
+setkey 9 parenleft 
+setkey at 0 
+setkey 0 parenright 
+setkey parenright minus 
+setkey less backquote 
+setkey greater tilde 
+setkey numbersign braceright 
+setkey backslash question 
+setkey bracketright braceleft 
+setkey braceleft quote 
+setkey braceright underscore 
+
+setkey -e
+if [ "${quiet}" = "" ]; then
+	echo AZERTY KBD
+fi
+
+#key names
+#escape, exclam (!), at (@), numbersign (#), dollar ($), parenright ()), caret (^), ampersand (&), asterisk (*), plus (+), percent (%)
+#minus (-), underscore (_), equal (=), parenleft [(], backspace (backspace), tab (Tab), bracketleft ([), braceleft ({), bracketright (])
+#braceright (}), enter (carriage return), semicolon (;), colon (:), quote (') , doublequote ("), slash (/), backquote (`), tilde (~)
+#backslash (\), bar (|), comma (,), less (<) period (.) , greater (>), question (?)
+#space, home, uparrow, pageup, leftarrow, center, rightarrow, end, downarrow, pagedown, insert, delete, F1-F12, shiftF1-shiftF12, ctrlF1-ctrlF12
+#Use prefix A for Alt+, e.g. Aequal, Aq, Aslash, A0, etc. 
\ No newline at end of file

KBD/cfg/KBD_CZECH_QWERTY.cfg

+#QWERTY CZECH
+#clear all settings
+setkey -r
+#setkey [new character] [QWERTY-USA character]
+setkey semicolon backquote
+setkey plus 1
+setkey equal minus
+setkey quote equal
+setkey parenright bracketright
+setkey doublequote backslash
+setkey minus slash
+#shift
+setkey 1 exclam
+setkey 2 at
+setkey 3 numbersign
+setkey 4 dollar
+setkey 5 percent
+setkey 6 caret
+setkey 7 ampersand
+setkey 8 asterisk
+setkey 9 parenleft
+setkey 0 parenright
+setkey percent underscore
+setkey slash braceleft
+setkey parenleft braceright
+setkey doublequote colon
+setkey exclam doublequote
+setkey quote bar
+setkey question less
+setkey colon greater
+setkey underscore question
+#Alt
+setkey backquote Abackquote
+setkey exclam A1
+setkey at A2
+setkey numbersign A3
+setkey dollar A4
+setkey percent A5
+setkey caret A6
+setkey ampersand A7
+setkey asterisk A8
+setkey parenleft A9
+setkey parenright A0
+setkey minus Aminus
+setkey equal Aequal
+setkey bracketleft Abracketleft
+setkey bracketright Abracketright
+setkey semicolon Asemicolon
+setkey backslash Abackslash
+setkey less Acomma
+setkey greater Aperiod
+setkey slash Aslash
+setkey tilde Atilde
+setkey underscore Aunderscore
+setkey plus Aplus
+setkey braceleft Abraceleft
+setkey braceright Abraceright
+setkey caret Adoublequote
+setkey colon Acolon
+setkey question Aquestion
+
+setkey bar Abar
+
+setkey -e
+if [ "${quiet}" = "" ]; then
+	echo CZECH QWERTY KBD
+fi
+
+#key names
+#escape, exclam (!), at (@), numbersign (#), dollar ($), parenright ()), caret (^), ampersand (&), asterisk (*), plus (+), percent (%)
+#minus (-), underscore (_), equal (=), parenleft [(], backspace (backspace), tab (Tab), bracketleft ([), braceleft ({), bracketright (])
+#braceright (}), enter (carriage return), semicolon (;), colon (:), quote (') , doublequote ("), slash (/), backquote (`), tilde (~)
+#backslash (\), bar (|), comma (,), less (<) period (.) , greater (>), question (?)
+#space, home, uparrow, pageup, leftarrow, center, rightarrow, end, downarrow, pagedown, insert, delete, F1-F12, shiftF1-shiftF12, ctrlF1-ctrlF12
+#Use prefix A for Alt+, e.g. Aequal, Aq, Aslash, A0, etc. 
\ No newline at end of file

KBD/cfg/KBD_CZECH_QWERTZ.cfg

+#QWERTZ CZECH
+#clear all settings
+setkey -r
+#setkey [new character] [QWERTY-USA character]
+setkey y z 
+setkey z y 
+setkey Y Z 
+setkey Z Y
+setkey semicolon backquote
+setkey plus 1
+setkey equal minus
+setkey quote equal
+setkey parenright bracketright
+setkey doublequote backslash
+setkey minus slash
+#shift
+setkey 1 exclam
+setkey 2 at
+setkey 3 numbersign
+setkey 4 dollar
+setkey 5 percent
+setkey 6 caret
+setkey 7 ampersand
+setkey 8 asterisk
+setkey 9 parenleft
+setkey 0 parenright
+setkey percent underscore
+setkey slash braceleft
+setkey parenleft braceright
+setkey doublequote colon
+setkey exclam doublequote
+setkey quote bar
+setkey question less
+setkey colon greater
+setkey underscore question
+#Alt
+setkey tilde A1
+setkey caret A3
+setkey backslash Aq
+setkey bar Aw
+setkey bracketleft Af
+setkey bracketright Ag
+setkey dollar Asemicolon
+setkey numbersign Ax
+setkey ampersand Ac
+setkey at Av
+setkey braceleft Ab
+setkey braceright An
+setkey less Acomma
+setkey greater Aperiod
+setkey asterisk Aslash
+
+setkey -e
+if [ "${quiet}" = "" ]; then
+	echo CZECH QWERTZ KBD
+fi
+
+#key names
+#escape, exclam (!), at (@), numbersign (#), dollar ($), parenright ()), caret (^), ampersand (&), asterisk (*), plus (+), percent (%)
+#minus (-), underscore (_), equal (=), parenleft [(], backspace (backspace), tab (Tab), bracketleft ([), braceleft ({), bracketright (])
+#braceright (}), enter (carriage return), semicolon (;), colon (:), quote (') , doublequote ("), slash (/), backquote (`), tilde (~)
+#backslash (\), bar (|), comma (,), less (<) period (.) , greater (>), question (?)
+#space, home, uparrow, pageup, leftarrow, center, rightarrow, end, downarrow, pagedown, insert, delete, F1-F12, shiftF1-shiftF12, ctrlF1-ctrlF12
+#Use prefix A for Alt+, e.g. Aequal, Aq, Aslash, A0, etc. 
\ No newline at end of file

KBD/cfg/KBD_DANISH.cfg

+#DANISH
+#clear all settings
+setkey -r
+#setkey [new character] [QWERTY-USA character]
+setkey plus minus
+setkey quote equal
+setkey doublequote bracketright
+setkey quote backslash
+setkey minus slash
+
+#shifted
+setkey doublequote at
+setkey ampersand caret
+setkey slash ampersand
+setkey parenleft asterisk
+setkey parenright parenleft
+setkey equal parenright
+setkey question underscore
+setkey caret braceright
+setkey asterisk bar
+setkey backquote plus
+setkey semicolon less
+setkey colon greater
+setkey underscore question
+
+#use top-left key for oem102 codes
+setkey bar Atilde
+setkey backslash Abackquote
+setkey greater tilde
+
+#AltGr
+setkey at A2
+setkey dollar A4
+setkey braceleft A7
+setkey bracketleft A8
+setkey bracketright A9
+setkey braceright A0
+setkey backslash Aminus
+
+setkey less quote
+setkey greater doublequote
+setkey tilde Abracketright
+
+setkey -e
+if [ "${quiet}" = "" ]; then
+	echo "DANISH KBD    a=<  A=>"
+	sleep 2
+fi 
+
+#key names
+#escape, exclam (!), at (@), numbersign (#), dollar ($), parenright ()), caret (^), ampersand (&), asterisk (*), plus (+), percent (%)
+#minus (-), underscore (_), equal (=), parenleft [(], backspace (backspace), tab (Tab), bracketleft ([), braceleft ({), bracketright (])
+#braceright (}), enter (carriage return), semicolon (;), colon (:), quote (') , doublequote ("), slash (/), backquote (`), tilde (~)
+#backslash (\), bar (|), comma (,), less (<) period (.) , greater (>), question (?)
+#space, home, uparrow, pageup, leftarrow, center, rightarrow, end, downarrow, pagedown, insert, delete, F1-F12, shiftF1-shiftF12, ctrlF1-ctrlF12
+#Use prefix A for Alt+, e.g. Aequal, Aq, Aslash, A0, etc. 
\ No newline at end of file

KBD/cfg/KBD_DVORAK_USA.cfg

+# Author: Alex Roper
+# set DVORAK keyboard
+#clear all settings
+setkey -r
+#setkey [new character] [QWERTY-USA character]
+setkey [ minus
+setkey braceleft underscore
+setkey quote q 
+setkey doublequote Q 
+setkey comma w 
+setkey less W 
+setkey s semicolon 
+setkey S colon 
+setkey semicolon z 
+setkey colon Z 
+setkey w comma 
+setkey W less 
+setkey v period 
+setkey z greater 
+setkey z slash 
+setkey equal bracketright 
+setkey backslash backslash 
+setkey underscore doublequote 
+setkey quote q
+setkey doublequote Q
+setkey comma w
+setkey less W
+setkey period e
+setkey greater E
+setkey p r
+setkey P R
+setkey y t
+setkey Y T
+setkey f y
+setkey F Y
+setkey g u
+setkey G U
+setkey c c
+setkey C I
+setkey r o
+setkey R O
+setkey l p
+setkey L P
+setkey bracketright equal
+setkey braceright plus
+setkey a a
+setkey A A
+setkey o s
+setkey O S
+setkey e d
+setkey E D
+setkey u f
+setkey U F
+setkey i g
+setkey I G
+setkey d h
+setkey D H
+setkey h j
+setkey H J
+setkey t k
+setkey T K
+setkey n l
+setkey N L
+setkey s semicolon
+setkey S colon
+setkey minus quote
+setkey underscore doublequote
+setkey semicolon z
+setkey colon Z
+setkey q x
+setkey Q X
+setkey j c
+setkey J C
+setkey k v
+setkey K V
+setkey x b
+setkey X B
+setkey b n
+setkey B N
+#setkey m m
+#setkey M M
+setkey w comma
+setkey W less
+setkey v period
+setkey V greater
+setkey z slash
+setkey Z question
+setkey slash bracketleft
+setkey question braceleft
+setkey equal bracketright
+setkey plus braceright
+
+setkey -e
+if [ "${quiet}" = "" ]; then
+	echo DVORAK KBD
+fi
+
+#key names
+#escape, exclam (!), at (@), numbersign (#), dollar ($), parenright ()), caret (^), ampersand (&), asterisk (*), plus (+), percent (%)
+#minus (-), underscore (_), equal (=), parenleft [(], backspace (backspace), tab (Tab), bracketleft ([), braceleft ({), bracketright (])
+#braceright (}), enter (carriage return), semicolon (;), colon (:), quote (') , doublequote ("), slash (/), backquote (`), tilde (~)
+#backslash (\), bar (|), comma (,), less (<) period (.) , greater (>), question (?)
+#space, home, uparrow, pageup, leftarrow, center, rightarrow, end, downarrow, pagedown, insert, delete, F1-F12, shiftF1-shiftF12, ctrlF1-ctrlF12
+#Use prefix A for Alt+, e.g. Aequal, Aq, Aslash, A0, etc. 
\ No newline at end of file