Skip to content

Commit b7f4722

Browse files
ebbezMexit
ebbez
and
Mexit
authored
Detect ISOs on all MultiOS-USB partitions (#49)
* Add detecting loopback on any partition and Ubuntu any partition example * Remove unneeded regex * detect ISOs from any partition * fix windows load * fix any partition detection on different configs * Delete config/debian/debian-mini.cfg --------- Co-authored-by: MexIT <25229673+Mexit@users.noreply.github.com>
1 parent ad06152 commit b7f4722

60 files changed

Lines changed: 270 additions & 225 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/4MLinux/4MLinux.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
iso_pattern1="4MLinux-*-64bit.iso"
55
iso_pattern2="4MServer-*-64bit.iso"
66

7-
for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
7+
for isofile in ($dev,*)$iso_dir/$iso_pattern1 ($dev,*)$iso_dir/$iso_pattern2; do
88
if [ -e "$isofile" ]; then
99
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
1010

11-
submenu "$isoname ->" "$isofile" {
12-
iso_path="$2"
13-
LOOPBACK "$iso_path"
11+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
12+
iso_path="$3"
13+
LOOPBACK "$2"
1414
isocfg=""
1515
bootoptions=""
1616
linux_path="(loop)/boot/bzImage"

‎config/Acronis_True_Image/Acronis_True_Image.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
iso_pattern="AcronisBootableMedia*.iso"
55

6-
for isofile in $iso_dir/$iso_pattern; do
6+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
77
if [ -e "$isofile" ]; then
88
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
99

10-
submenu "$isoname ->" "$isofile" {
11-
iso_path="$2"
12-
LOOPBACK "$iso_path"
10+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
11+
iso_path="$3"
12+
LOOPBACK "$2"
1313

1414
menuentry "Acronis True Image (64-bit)" {
1515
echo Loading kernel...

‎config/AntivirusLiveCD/AntivirusLiveCD.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
iso_pattern="AntivirusLiveCD-*.iso"
66

7-
for isofile in $iso_dir/$iso_pattern; do
7+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
88
if [ -e "$isofile" ]; then
99
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
1010

11-
submenu "$isoname ->" "$isofile" {
12-
iso_path="$2"
13-
LOOPBACK "$iso_path"
11+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
12+
iso_path="$3"
13+
LOOPBACK "$2"
1414
isocfg=""
1515
bootoptions="rw"
1616
linux_path="(loop)/boot/bzImage"

‎config/Archman/Archman.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
iso_pattern="Archman-*-x86_64.iso"
55

6-
for isofile in $iso_dir/$iso_pattern; do
6+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
77
if [ -e "$isofile" ]; then
88
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
99

10-
submenu "$isoname ->" "$isofile" {
11-
iso_path="$2"
12-
LOOPBACK "$iso_path"
10+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
11+
iso_path="$3"
12+
LOOPBACK "$2"
1313
probe --label --set=cd_label (loop)
1414
isocfg="img_dev=$imgdevpath img_loop=$iso_path"
1515
bootoptions="archisobasedir=arch archisolabel=$cd_label cow_spacesize=10G earlymodules=loop modules-load=loop rd.modules-load=loop"

‎config/CentOS/CentOS.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
iso_pattern="CentOS-*-x86_64-*.iso"
44

5-
for isofile in $iso_dir/$iso_pattern; do
5+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
66
if [ -e "$isofile" ]; then
77
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
88

9-
submenu "$isoname ->" "$isofile" {
10-
iso_path="$2"
11-
LOOPBACK "$iso_path"
9+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
10+
iso_path="$3"
11+
LOOPBACK "$2"
1212
probe --label --set=cd_label (loop)
1313
isocfg="iso-scan/filename=$iso_path"
1414
bootoptions="inst.stage2=hd:LABEL=$cd_label quiet"

‎config/KDE_neon/neon-user.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
iso_pattern="neon-user-*.iso"
55

6-
for isofile in $iso_dir/$iso_pattern; do
6+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
77
if [ -e "$isofile" ]; then
88
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
99

10-
submenu "$isoname ->" "$isofile" {
11-
iso_path="$2"
12-
LOOPBACK "$iso_path"
10+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
11+
iso_path="$3"
12+
LOOPBACK "$2"
1313
isocfg="iso-scan/filename=${iso_path}"
1414
bootoptions="boot=casper apparmor=0 quiet splash"
1515
linux_path="(loop)/casper/vmlinuz"

‎config/KaOS/KaOS.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
iso_pattern="KaOS-*-x86_64.iso"
55

6-
for isofile in $iso_dir/$iso_pattern; do
6+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
77
if [ -e "$isofile" ]; then
88
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
99

10-
submenu "$isoname ->" "$isofile" {
11-
iso_path="$2"
12-
LOOPBACK "$iso_path"
10+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
11+
iso_path="$3"
12+
LOOPBACK "$2"
1313
probe --label --set=cd_label (loop)
1414
isocfg="img_dev=$imgdevpath img_loop=$iso_path"
1515
bootoptions="kdeosisobasedir=kdeos kdeosisolabel=$cd_label xdriver=no nouveau.modeset=1 i915.modeset=1 radeon.modeset=1"

‎config/Linuxfx/Linuxfx.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
iso_pattern="linuxfx*.iso"
55

6-
for isofile in $iso_dir/$iso_pattern; do
6+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
77
if [ -e "$isofile" ]; then
88
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
99

10-
submenu "$isoname ->" "$isofile" {
11-
iso_path="$2"
12-
LOOPBACK "$iso_path"
10+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
11+
iso_path="$3"
12+
LOOPBACK "$2"
1313
isocfg="iso-scan/filename=$iso_path"
1414
bootoptions="boot=casper quiet splash"
1515
linux_path="(loop)/casper/vmlinuz"

‎config/Mageia/Mageia_netinstall.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
iso_pattern="Mageia-*-netinstall-*x86_64.iso"
44

5-
for isofile in $iso_dir/$iso_pattern; do
5+
for isofile in ($dev,*)$iso_dir/$iso_pattern; do
66
if [ -e "$isofile" ]; then
77
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
88

9-
submenu "$isoname ->" "$isofile" {
10-
iso_path="$2"
11-
LOOPBACK "$iso_path"
9+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
10+
iso_path="$3"
11+
LOOPBACK "$2"
1212
isocfg=""
1313
bootoptions="audit=0"
1414
linux_path="(loop)/isolinux/x86_64/vmlinuz"

‎config/antiX/antiX_base_full.cfg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
iso_pattern1="antiX-*_x64-base.iso"
55
iso_pattern2="antiX-*_x64-full.iso"
66

7-
for isofile in $iso_dir/$iso_pattern1 $iso_dir/$iso_pattern2; do
7+
for isofile in ($dev,*)$iso_dir/$iso_pattern1 ($dev,*)$iso_dir/$iso_pattern2; do
88
if [ -e "$isofile" ]; then
99
regexp --set=isoname "$iso_dir/(.*)" "$isofile"
1010

11-
submenu "$isoname ->" "$isofile" {
12-
iso_path="$2"
13-
LOOPBACK "$iso_path"
11+
submenu "$isoname ->" "$isofile" "$iso_dir/$isoname" {
12+
iso_path="$3"
13+
LOOPBACK "$2"
1414
isocfg="from=hd,usb fromiso=$iso_path"
1515
bootoptions="quiet splasht disable=lxF"
1616
linux_path="(loop)/antiX/vmlinuz"

0 commit comments

Comments
 (0)