1.0.29 release

This commit is contained in:
longpanda
2020-11-19 20:45:17 +08:00
parent 8c192a1807
commit d8fbd79dda
27 changed files with 2071 additions and 1330 deletions

View File

@@ -42,10 +42,17 @@ fi
echo "VTKS=$VTKS" >> $VTLOG
if ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
for vtDud in $(ls $VTOY_PATH/ventoy_dud*); do
vtInstDD="$vtInstDD inst.dd=file:$vtDud"
done
fi
echo "vtInstDD=$vtInstDD" >> $VTLOG
if $GREP -q 'root=live' /proc/cmdline; then
$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=live:/dev/dm-0 $VTKS#" -i /lib/dracut-lib.sh
$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE root=live:/dev/dm-0 $VTKS $vtInstDD#" -i /lib/dracut-lib.sh
else
$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/dm-0 $VTKS#" -i /lib/dracut-lib.sh
$SED "s#printf\(.*\)\$CMDLINE#printf\1\$CMDLINE inst.stage2=hd:/dev/dm-0 $VTKS $vtInstDD#" -i /lib/dracut-lib.sh
fi
ventoy_set_inotify_script rhel7/ventoy-inotifyd-hook.sh

View File

@@ -26,6 +26,32 @@ if [ -f $VTOY_PATH/autoinstall ]; then
fi
fi
if $BUSYBOX_PATH/ls $VTOY_PATH | $GREP -q 'ventoy_dud[0-9]'; then
if [ -f /linuxrc.config ]; then
vtKerVer=$($BUSYBOX_PATH/uname -r)
ventoy_check_insmod /modules/loop.ko
ventoy_check_insmod /modules/squashfs.ko
ventoy_check_mount /parts/00_lib /modules
ventoy_check_insmod /modules/lib/modules/$vtKerVer/initrd/isofs.ko
$BUSYBOX_PATH/umount /modules
for vtDud in $($BUSYBOX_PATH/ls $VTOY_PATH/ventoy_dud*); do
$BUSYBOX_PATH/mkdir -p ${vtDud%.*}_mnt
if $BUSYBOX_PATH/mount $vtDud ${vtDud%.*}_mnt > /dev/null 2>&1; then
$BUSYBOX_PATH/cp -a ${vtDud%.*}_mnt ${vtDud%.*}_data
$BUSYBOX_PATH/umount ${vtDud%.*}_mnt
echo "dud: file://${vtDud%.*}_data" >> /linuxrc.config
else
echo "mount $vtDud failed" >> $VTLOG
fi
done
$BUSYBOX_PATH/rmmod isofs >> $VTLOG 2>&1
$BUSYBOX_PATH/rmmod squashfs >> $VTLOG 2>&1
$BUSYBOX_PATH/rmmod loop >> $VTLOG 2>&1
fi
fi
#echo "Exec: /bin/sh $VTOY_PATH/hook/suse/cdrom-hook.sh" >> /info-ventoy
#echo "install: hd:/?device=/dev/mapper/ventoy" >> /info-ventoy

View File

@@ -110,4 +110,14 @@ ventoy_set_loop_inotify_script() {
echo $VTOY_PATH/loop/$1 > $VTOY_PATH/inotifyd-loop-script.txt
}
ventoy_check_insmod() {
if [ -e $1 ]; then
$BUSYBOX_PATH/insmod $1
fi
}
ventoy_check_mount() {
if [ -e $1 ]; then
$BUSYBOX_PATH/mount $1 $2
fi
}