Skip to content
This repository was archived by the owner on Dec 13, 2022. It is now read-only.

Commit 8d17ca4

Browse files
nguyentuminenguyentumine
committed
v0.9.9.1
- Rearrange the order of all disks if the current disk is not 0. - DLC Boot, AnhDV Boot, HKBoot - VMware vSphere Hypervisor (ESXi) (UEFI & Legacy).
1 parent f1cb41a commit 8d17ca4

File tree

11 files changed

+156
-34
lines changed

11 files changed

+156
-34
lines changed

‎AIO/Tools/AIOCreator_x64.exe

1 KB
Binary file not shown.

‎AIO/Tools/syslinux/menu.c32

53.8 KB
Binary file not shown.

‎AIO/Tools/syslinux/syslinux.exe

85 KB
Binary file not shown.

‎AIO/Tools/syslinux/syslinux64.exe

88.5 KB
Binary file not shown.

‎AIO/grub/functions.cfg

Lines changed: 47 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -268,25 +268,43 @@ function drivemap_to_hd0 {
268268
else
269269
set device="${1}"
270270
fi
271-
if regexp -s disknum '^hd([0-9]+)' "$device"; then
272-
if [ "$disknum" != "0" ]; then
273-
drivemap -s (hd0) (hd${disknum})
274-
if [ -n "$2" ]; then
275-
set _var="$2"
276-
probe -p -s hdscheme $device
277-
regexp -s partnum "^hd${disknum},${hdscheme}([0-9]+)" "$device"
278-
regexp -s partnum "([0-9]+).${partnum}" "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
279-
set $"${_var}"="(hd0,${partnum})"
280-
unset _var
281-
unset hdscheme
282-
unset partnum
283-
fi
284-
return 0
271+
if ! regexp -s disknum '^hd([0-9]+)' "$device"; then
272+
esc 1 "Only hard disks are supported."
273+
return 1
274+
fi
275+
if [ "$disknum" != "0" ]; then
276+
if [ "$disknum" == "1" ]; then
277+
drivemap -s (hd0) (hd1)
278+
else
279+
set arr="9 8 7 6 5 4 3 2 1"
280+
# 10 disks is enough?
281+
regexp -s arr "${disknum} (.*)" "$arr"
282+
drivemap -s (hd${disknum}) (hd0)
283+
set _disknum="$disknum"
284+
for num in $arr; do
285+
drivemap -s (hd${_disknum}) (hd${num})
286+
set _disknum=${num}
287+
done
288+
drivemap (hd0) (hd1)
289+
unset num
290+
unset _disknum
291+
unset arr
285292
fi
286-
unset disknum
293+
fi
294+
unset disknum
295+
if [ -n "$2" ]; then
296+
# convert grub2 root to grub4dos root and set variable 2
297+
set _var="$2"
298+
probe -p -s hdscheme $device
299+
regexp -s partnum "^hd${disknum},${hdscheme}([0-9]+)" "$device"
300+
regexp -s partnum "([0-9]+).${partnum}" "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
301+
set $"${_var}"="(hd0,${partnum})"
302+
unset _var
303+
unset hdscheme
304+
unset partnum
287305
fi
288306
unset device
289-
return 1
307+
return 0
290308
}
291309

292310
function partimgentry {
@@ -320,7 +338,7 @@ function partimgentry {
320338
fi
321339
elif [ "${parttype}" == "jfs" ]; then fstype="0x35"
322340
fi
323-
set opt="debug off; root ${g4droot} > nul; ${g4d_path}/partnew.g4b ${g4ddisk},${partnum} ${fstype} ${2} ${lang}"
341+
set opt="root ${g4droot}; ${g4d_path}/partnew.g4b ${g4ddisk},${partnum} ${fstype} ${2} ${lang}"
324342
linux ${g4d_path}/grub.exe --config-file=${opt}
325343
fi
326344
fi
@@ -468,8 +486,7 @@ function WindowsDetect {
468486
'(' -f ($device)/NTLDR -a -e ($device)/NTDETECT.COM -a -f ($device)/BOOT.INI ')' \
469487
; then
470488
set root="$device"
471-
regexp -s devnum 'hd([0-9]+)' $root
472-
if test "$devnum" != "0"; then drivemap -s hd0 $root; fi
489+
drivemap_to_hd0 "$root"
473490
ntldr /ntldr
474491
boot
475492
fi
@@ -595,20 +612,18 @@ function FileProcessing {
595612
fi
596613
elif [ -e (isoloop)/I386/TXTSETUP.SIF ] -o [ -e (isoloop)/AMD64/TXTSETUP.SIF ]; then
597614
menuentry "${installxp} - ${stepmsg} 1" {
598-
if ! drivemap_to_hd0 "${root}" "g4droot"; then
599-
grub4dosroot
615+
if drivemap_to_hd0 "${root}" "g4droot"; then
616+
set g4d_cmd="root ${g4droot};${g4d_path}/INSTALLXP cd $path";
617+
linux ${g4d_path}/grub.exe --config-file=${g4d_cmd};
618+
initrd ${g4d_path}/winvblk.img;
600619
fi
601-
set g4d_cmd="root ${g4droot};${g4d_path}/INSTALLXP cd $path";
602-
linux ${g4d_path}/grub.exe --config-file=${g4d_cmd};
603-
initrd ${g4d_path}/winvblk.img;
604620
}
605621
menuentry "${installxp} - ${stepmsg} 2" {
606-
if ! drivemap_to_hd0 "${root}" "g4droot"; then
607-
grub4dosroot
622+
if drivemap_to_hd0 "${root}" "g4droot"; then
623+
set g4d_cmd="root ${g4droot};${g4d_path}/INSTALLXP hd $path";
624+
linux ${g4d_path}/grub.exe --config-file=${g4d_cmd};
625+
initrd ${g4d_path}/winvblk.img;
608626
fi
609-
set g4d_cmd="root ${g4droot};${g4d_path}/INSTALLXP hd $path";
610-
linux ${g4d_path}/grub.exe --config-file=${g4d_cmd};
611-
initrd ${g4d_path}/winvblk.img;
612627
}
613628
elif test -e (isoloop)/boot/grub/loopback.cfg -o -e (isoloop)/efi/boot/loopback.cfg -o -e (isoloop)/boot/grub/loopback.cfg; then
614629
for cfg in /boot/grub/loopback.cfg /efi/boot/loopback.cfg /EFI/BOOT/loopback.cfg; do
@@ -847,7 +862,7 @@ function FileProcessing {
847862
elif [ wimtools --exist "${file}" \\I386\\System32\\cmd.exe ] -a [ -n "$pc" ]; then
848863
grub4dosroot
849864
set fullpath="${g4droot}${path}"
850-
set opt="debug off; ${g4d_path}/bootvhd.g4b PE1 ${fullpath}"
865+
set opt="${g4d_path}/bootvhd.g4b PE1 ${fullpath}"
851866
linux ${g4d_path}/grub.exe --config-file=${opt}
852867
fi
853868
elif [ "$file_ext" == "vhd" ] -o [ "$file_ext" == "vhdx" ]; then
@@ -860,7 +875,7 @@ function FileProcessing {
860875
menuentry "[2] Windows XP/2003 (NT5)" "${path}" --hotkey="2" {
861876
grub4dosroot
862877
set fullpath="${g4droot}${2}"
863-
set opt="debug off; ${g4d_path}/bootvhd.g4b NT5 ${fullpath}"
878+
set opt="${g4d_path}/bootvhd.g4b NT5 ${fullpath}"
864879
linux ${g4d_path}/grub.exe --config-file=${opt}
865880
}
866881
fi
@@ -873,7 +888,7 @@ function FileProcessing {
873888
if [ "$3" == "iso" ]; then set boottype="bootiso"; else set boottype="bootraw"; fi
874889
grub4dosroot
875890
set fullpath="${g4droot}${path}"
876-
set opt="debug off; ${g4d_path}/${boottype}.g4b ${fullpath}"
891+
set opt="${g4d_path}/${boottype}.g4b ${fullpath}"
877892
linux ${g4d_path}/grub.exe --config-file=${opt}
878893
}
879894
unset timeout

‎AIO/grub/menuoff/anhdv.cfg

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
### Start Anhdv_Boot_2020_v2.0.3_Build_200726
2+
### Anhdv_Boot_2020_v2.0.3_Build_200726.iso
3+
set timeout=0
4+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "x64" ]; then
5+
menuentry "[1] Win 10 PE x64" --hotkey=1 {
6+
ntbootcmd "/AIO/Files/AnhDV/WIM/w10pe64.wim" "wim"
7+
}
8+
fi
9+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "ia32" ]; then
10+
menuentry "[2] Win 8 PE x32" --hotkey=2 {
11+
ntbootcmd "/AIO/Files/AnhDV/WIM/w8pe32.wim" "wim"
12+
}
13+
fi
14+
if [ -n "$pc" ]; then
15+
unset timeout
16+
menuentry "[3] Win 8 PE x32 [Lite]" --hotkey=3 {
17+
ntbootcmd "/AIO/Files/AnhDV/WIM/w8pe32lite.wim" "wim"
18+
}
19+
fi
20+
if [ -n "$pc" ]; then
21+
menuentry "[4] XP" --hotkey=4 {
22+
ntldr /AIO/Files/AnhDV/MiniXP.mbr
23+
}
24+
fi
25+
### End Anhdv_Boot_2020_v2.0.3_Build_200726

‎AIO/grub/menuoff/dlc1.cfg

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
### Start DLC.Boot.2019.V3.6
2+
### DLC.Boot.2019.V3.6.rar
3+
set timeout=0
4+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "x64" ]; then
5+
menuentry "[1] W10x64" --hotkey=1 {
6+
ntbootcmd "/DLC1/W10PE/W10x64.wim" "wim"
7+
}
8+
fi
9+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "ia32" ]; then
10+
menuentry "[2] W10x86" --hotkey=2 {
11+
ntbootcmd "/DLC1/W10PE/W10x86.wim" "wim"
12+
}
13+
fi
14+
if [ -n "$pc" ]; then
15+
unset timeout
16+
menuentry "[3] XP" --hotkey=3 {
17+
ntldr /DLC1/XP/XP.BIN
18+
}
19+
fi
20+
### End DLC.Boot.2019.V3.6

‎AIO/grub/menuoff/hkboot.cfg

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
### Start HKBoot_2017_ChiaSeTuTam.Com
2+
### HKBoot_2017_ChiaSeTuTam.Com.ISO
3+
set timeout=0
4+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "x64" ]; then
5+
unset timeout
6+
menuentry "[1] Win 10 PE x64" --hotkey=1 {
7+
ntbootcmd "/AIO/Files/HKBoot/HKBoot/PE/W10x64PE.wim" "wim"
8+
}
9+
fi
10+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "ia32" ]; then
11+
menuentry "[2] Win 10 PE x32" --hotkey=2 {
12+
ntbootcmd "/AIO/Files/HKBoot/HKBoot/PE/W10x86PE.wim" "wim"
13+
}
14+
fi
15+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "x64" ]; then
16+
unset timeout
17+
menuentry "[3] Win 8 PE x64" --hotkey=3 {
18+
ntbootcmd "/AIO/Files/HKBoot/HKBoot/PE/W8x64PE.wim" "wim"
19+
}
20+
fi
21+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "ia32" ]; then
22+
menuentry "[4] Win 8 PE x32" --hotkey=4 {
23+
ntbootcmd "/AIO/Files/HKBoot/HKBoot/PE/W8x86PE.wim" "wim"
24+
}
25+
fi
26+
### End HKBoot_2017_ChiaSeTuTam.Com

‎AIO/grub/menuoff/strelec.cfg

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
### Start WinPE10_8_Sergei_Strelec_x86_x64_2020.06.09_English
2+
### WinPE10_8_Sergei_Strelec_x86_x64_2020.06.09_English.iso
3+
set timeout=0
4+
5+
if [ -e /SSTR/strelec10x64Eng.wim ]; then
6+
set sstr_file="Eng.wim"
7+
else
8+
set sstr_file=".wim"
9+
fi
10+
11+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "x64" ]; then
12+
menuentry "[1] strelec 10 x64" --hotkey=1 {
13+
ntbootcmd "/SSTR/strelec10x64${sstr_file}" "wim"
14+
}
15+
fi
16+
if [ -n "$pc" ] -o [ -n "$efi" -a "$_SPEC_UEFI_ARCH" == "ia32" ]; then
17+
menuentry "[2] strelec 10 x32" --hotkey=2 {
18+
ntbootcmd "/SSTR/strelec10${sstr_file}" "wim"
19+
}
20+
fi
21+
if [ -n "$pc" ]; then
22+
menuentry "[4] strelec 8" --hotkey=4 {
23+
ntbootcmd "/SSTR/strelec8${sstr_file}" "wim"
24+
}
25+
fi
26+
if [ -n "$pc" ]; then
27+
unset timeout
28+
menuentry "[3] strelec 8 NE" --hotkey=3 {
29+
ntbootcmd "/SSTR/strelec8NE${sstr_file}" "wim"
30+
}
31+
fi
32+
### End WinPE10_8_Sergei_Strelec_x86_x64_2020.06.09_English

‎AIO/grub/menuoff/vSphereHypervisor.cfg

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
### Start
2-
### VMware-VMvisor-Installer-6.7.0-8169922.x86_64.iso
2+
### VMware-VMvisor-Installer-7.0b-16324942.x86_64.iso
33
set extract_path=""
44
set timeout=0
55
menuentry "[1] VMware vSphere Hypervisor" --hotkey=1 {
6-
chainloader ${extract_path}/EFI/BOOT/BOOTX64.EFI
6+
if [ -n "$efi" ]; then
7+
chainloader ${extract_path}/syslinux/EFI/BOOT/BOOTX64.EFI
8+
else
9+
chainloader ${extract_path}/syslinux/syslinux.bin
10+
fi
711
}
812
### End

0 commit comments

Comments
 (0)