Commit d1481392 authored by longpanda's avatar longpanda
Browse files

Add QT GUI install program

parent dd2411d7
...@@ -27,6 +27,33 @@ vtlog "####### $0 $* ########" ...@@ -27,6 +27,33 @@ vtlog "####### $0 $* ########"
VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH 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=$(ls $VTOY_PATH/mnt/iso/*.sfs)
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"
insmod $KoName
umount $VTOY_PATH/mnt/squashfs
umount $VTOY_PATH/mnt/iso
umount $VTOY_PATH/mnt/fuse
}
wait_for_usb_disk_ready wait_for_usb_disk_ready
vtdiskname=$(get_ventoy_disk_name) vtdiskname=$(get_ventoy_disk_name)
...@@ -36,6 +63,12 @@ if [ "$vtdiskname" = "unknown" ]; then ...@@ -36,6 +63,12 @@ if [ "$vtdiskname" = "unknown" ]; then
exit 0 exit 0
fi 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" ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
if ! [ -e $VTOY_DM_PATH ]; then if ! [ -e $VTOY_DM_PATH ]; then
......
...@@ -18,8 +18,15 @@ ...@@ -18,8 +18,15 @@
#************************************************************************************ #************************************************************************************
$SED '1 apmedia=usbhd' -i /init $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 "/^ *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
elif $GREP -q 'LESSPARTS=' /init; then
$SED "/^ *LESSPARTS=/a\ $BUSYBOX_PATH/sh $VTOY_PATH/hook/debian/puppy-disk.sh" -i /init
$SED "/^ *LESSPARTS=/a\ LESSPARTS='ventoy|iso9660'" -i /init
fi
if [ -f /DISTRO_SPECS ]; then if [ -f /DISTRO_SPECS ]; then
if ! [ -d /dev ]; then if ! [ -d /dev ]; then
......
...@@ -35,7 +35,7 @@ ventoy_get_debian_distro() { ...@@ -35,7 +35,7 @@ ventoy_get_debian_distro() {
fi fi
if [ -e /init ]; then if [ -e /init ]; then
if $GREP -q PUPPYSFS /init; then if $EGREP -q 'PUPPYSFS|PUPPYFILE' /init; then
if $GREP -q VEKETSFS /init; then if $GREP -q VEKETSFS /init; then
echo 'veket'; return echo 'veket'; return
else else
......
No preview for this file type
No preview for this file type
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<property name="resizable">False</property> <property name="resizable">False</property>
<property name="title" translatable="yes">Partition Configuration</property> <property name="title" translatable="yes">Partition Configuration</property>
<property name="modal">True</property> <property name="modal">True</property>
<property name="window_position">center</property>
<property name="default_width">460</property> <property name="default_width">460</property>
<property name="default_height">270</property> <property name="default_height">270</property>
<child> <child>
......
[
{
"type": "env",
"name": "DESKTOP_SESSION",
"condition": "equal",
"expression": "deepin",
"gui": "qt5"
},
{
"type": "env",
"name": "DESKTOP_SESSION",
"condition": "equal",
"expression": "uos",
"gui": "qt5"
},
{
"type": "env",
"name": "DESKTOP_SESSION",
"condition": "equal",
"expression": "ukui",
"gui": "gtk3"
}
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment