Fix iso loopback

config/4MLinux/4MLinux.cfg

@@ -10,7 +10,7 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg=""
 			bootoptions=""
 			linux_path="(loop)/boot/bzImage"

config/Acronis_True_Image/Acronis_True_Image.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 
 			menuentry "Acronis True Image (64-bit)" {
 				echo Loading kernel...

config/AntivirusLiveCD/AntivirusLiveCD.cfg

@@ -10,7 +10,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg=""
 			bootoptions="rw"
 			linux_path="(loop)/boot/bzImage"

config/Archman/Archman.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="img_dev=$imgdevpath img_loop=$iso_path"
 			bootoptions="archisobasedir=arch archisolabel=$cd_label cow_spacesize=10G earlymodules=loop modules-load=loop rd.modules-load=loop"

config/CentOS/CentOS.cfg

@@ -8,7 +8,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="inst.stage2=hd:LABEL=$cd_label quiet"

config/EndeavourOS/EndeavourOS.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="img_dev=$imgdevpath img_loop=$iso_path"
 			bootoptions="archisobasedir=arch cow_spacesize=10G archisolabel=$cd_label earlymodules=loop modules-load=loop rd.modules-load=loop"

config/Gentoo/Gentoo.cfg

@@ -10,7 +10,7 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
 		submenu "$isoname ->" "$isofile" {
 			gfxpayload=keep
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="isoboot=$iso_path"
 			bootoptions="root=/dev/ram0 init=/linuxrc dokeymap looptype=squashfs loop=/image.squashfs cdroot"
 			linux_path="(loop)/boot/gentoo"

config/KDE_neon/neon-user.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="iso-scan/filename=${iso_path}"
 			bootoptions="boot=casper apparmor=0 quiet splash"
 			linux_path="(loop)/casper/vmlinuz"

config/KaOS/KaOS.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="img_dev=$imgdevpath img_loop=$iso_path"
 			bootoptions="kdeosisobasedir=kdeos kdeosisolabel=$cd_label xdriver=no nouveau.modeset=1 i915.modeset=1 radeon.modeset=1"

config/Linuxfx/Linuxfx.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="boot=casper quiet splash"
 			linux_path="(loop)/casper/vmlinuz"

config/Mageia/Mageia_netinstall.cfg

@@ -8,7 +8,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg=""
 			bootoptions="audit=0"
 			linux_path="(loop)/isolinux/x86_64/vmlinuz"

config/antiX/antiX_base_full.cfg

@@ -10,7 +10,7 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="from=hd,usb fromiso=$iso_path"
 			bootoptions="quiet splasht disable=lxF"
 			linux_path="(loop)/antiX/vmlinuz"

config/antiX/antiX_core_net.cfg

@@ -10,7 +10,7 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="from=hd,usb fromiso=$iso_path"
 			bootoptions="quiet splash=v disable=lx"
 			linux_path="(loop)/antiX/vmlinuz"

config/archbang/archbang.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="img_dev=$imgdevpath img_loop=$iso_path"
 			bootoptions="archisobasedir=arch archisolabel=$cd_label cow_spacesize=2G"

config/athenaos/athenaos.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="img_dev=$imgdevpath img_loop=$iso_path"
 			bootoptions="archisobasedir=arch archisolabel=ATHENA-OS cow_spacesize=4G copytoram=n driver=free nouveau.modeset=1 radeon.modeset=1 i915.modeset=1 nvme_load=yes"

config/bluestar/bluestar.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			root=(loop)
 			probe --label --set=cd_label (loop)
 			isocfg="img_dev=$imgdevpath img_loop=$iso_path"

config/clonezilla/clonezilla.cfg

@@ -8,7 +8,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="findiso=$iso_path"
 			bootoptions='boot=live union=overlay username=user config quiet components noswap edd=on \
 				enforcing=0 locales= keyboard-layouts= ocs_live_run="ocs-live-general" ocs_live_extra_param="" \

config/clonezilla/clonezilla_eoan.cfg

@@ -8,7 +8,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="findiso=$iso_path"
 			bootoptions='boot=live union=overlay username=user hostname=eoan config quiet components noswap edd=on \
 				enforcing=0 locales= keyboard-layouts= ocs_live_run="ocs-live-general" ocs_live_extra_param="" \

config/clonezilla/clonezilla_focal.cfg

@@ -8,7 +8,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="findiso=$iso_path"
 			bootoptions='boot=live union=overlay username=user hostname=focal config quiet components noswap edd=on \
 				enforcing=0 locales= keyboard-layouts= ocs_live_run="ocs-live-general" ocs_live_extra_param="" \

config/damnsmalllinux/damnsmalllinux.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="from=hd,usb,mmc fromiso=$iso_path"
 			bootoptions="quiet splasht disable=lxF"
 			linux_path="(loop)/antiX/vmlinuz"

config/debian/debian-mini.cfg

@@ -17,7 +17,7 @@ for isofile in $iso_dir/$iso_pattern; do
 		menuentry "$isoname ($grub_configfile) ->" "$isofile" "$grub_configfile" {
 			iso_path="$2"
 			export iso_path
-			loopback loop "$iso_path"
+			LOOPBACK "$iso_path"
 			root=(loop)
 			configfile /boot/grub/$3
 			loopback --delete loop

config/devuan/devuan-install.cfg

@@ -11,7 +11,7 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2 $iso_dir/$iso_patte
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg=""
 			bootoptions=""
 			linux_path="(loop)/boot/isolinux/linux"

config/devuan/devuan_desktop-live.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="findiso=$iso_path"
 			bootoptions="boot=live username=devuan apparmor=0"
 			linux_path="(loop)/live/vmlinuz"

config/devuan/devuan_minimal-live.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="findiso=$iso_path"
 			bootoptions="boot=live"
 			linux_path="(loop)/live/vmlinuz"

config/dr-parted-live/dr-parted-live.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="findiso=$iso_path"
 			bootoptions="boot=live components"
 			linux_path="(loop)/live/vmlinuz"

config/euroLinux/EuroLinux-desktop.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="root=live:CDLABEL=$cd_label selinux=0 rd.live.image"

config/euroLinux/EuroLinux.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="inst.stage2=hd:LABEL=$cd_label"

config/fedora/fedora-live.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="root=live:CDLABEL=$cd_label rd.live.image quiet"

config/fedora/fedora.cfg

@@ -11,7 +11,7 @@ for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2 $iso_dir/$iso_patte
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="inst.stage2=hd:LABEL=$cd_label quiet"

config/ferenos/ferenos.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="iso-scan/filename=${iso_path}"
 			bootoptions="file=/cdrom/preseed/ferenos.seed boot=casper"
 			linux_path="(loop)/casper/vmlinuz"

config/gparted/gparted-live.cfg

@@ -8,7 +8,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="findiso=$iso_path"
 			bootoptions="boot=live union=overlay username=user config components quiet noswap"
 			linux_path="(loop)/live/vmlinuz"

config/grub.config

@@ -77,6 +77,13 @@ function find_grub_cfg {
 	}
 }
 
+function LOOPBACK {
+	if [ -e (loop) ]; then
+		loopback --delete loop
+	fi
+	loopback loop "$1"
+}
+
 submenu "Auto-detect ISOs (Directory: $iso_dir) -->" {
 	echo -n "Loading configuration files... "
 	for cfgfile in /MultiOS-USB/config/*/*.cfg /MultiOS-USB/config_priv/*/*.cfg; do

config/grub_loopback/loopback.cfg

@@ -1,28 +1,24 @@
 # detect loopback.cfg compatible ISO's
 
-for isofile in $iso_dir/*.iso $iso_dir/*/*.iso; do
+for isofile in $iso_dir/*.iso; do
 	if [ -e "$isofile" ]; then
 		regexp --set=isoname "$iso_dir/(.*)" "$isofile"
 
-		loopback loop "$isofile"
+		LOOPBACK "$isofile"
 		if [ -e "(loop)/boot/grub/loopback.cfg" ]; then
 			grub=grub
 		elif [ -e "(loop)/boot/grub2/loopback.cfg" ]; then
 			grub=grub2
 		else
-			loopback --delete loop
 			continue
 		fi
 
 		submenu "$isoname (loopback) ->" "$isofile" "$grub" {
 			iso_path="$2"
 			export iso_path
-			loopback loop "$2"
+			LOOPBACK "$2"
 			root=(loop)
 			configfile /boot/$3/loopback.cfg
-			loopback --delete loop
 		}
-
-		loopback --delete loop
 	fi
 done

config/kaspersky/krd.cfg

@@ -10,7 +10,7 @@ for isofile in /data/$iso_pattern; do
 
 		submenu "Kaspersky Rescue Disk ($isoname) ->" "$isofile" "$isoname" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="isoloop=$3"
 			bootoptions="net.ifnames=0 lang=en"
 			linux_path="(loop)/boot/grub/k-x86_64"

config/lwRescue/lwRescue.cfg

@@ -8,7 +8,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="isoloop=$iso_path scandelay=1"
 			bootoptions="setkmap=de"
 			linux_path="(loop)/isolinux/rescue64"

config/mx/MX-19.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="from=hd,usb fromiso=$iso_path"
 			bootoptions="quiet splasht nosplash"
 			linux_path="(loop)/antiX/vmlinuz"

config/openSUSE/openSUSE-DVD.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="install=hd:$iso_path"
 			bootoptions="splash=silent"
 			linux_path="(loop)/boot/x86_64/loader/linux"

config/openSUSE/openSUSE-NET.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg=""
 			bootoptions="splash=silent"
 			linux_path="(loop)/boot/x86_64/loader/linux"

config/oracleLinux/OracleLinux.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			probe --label --set=cd_label (loop)
 			isocfg="iso-scan/filename=$iso_path"
 			bootoptions="inst.stage2=hd:LABEL=$cd_label"

config/pclinuxos/pclinuxos.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			isocfg="bootfromiso=$iso_path root=(loop)"
 			bootoptions="livecd=livecd vga=788 keyb=us"
 			linux_path="(loop)/isolinux/vmlinuz"

config/ploplinux/ploplinux.cfg

@@ -9,7 +9,7 @@ for isofile in $iso_dir/$iso_pattern; do
 
 		submenu "$isoname ->" "$isofile" {
 			iso_path="$2"
-			loopback loop $iso_path
+			LOOPBACK "$iso_path"
 			root=(loop)
 			isocfg="iso_filename=$iso_path"
 			bootoptions=""