v0.9.9.3

- Many users reported that Grub2 does not show the menu in UEFI mode (black screen). This bug has been fixed in this version. Tested on Dell Precision M4700 and DELL VOSTRO 15 3568. Grub2 can be booted on the Dell Precision M4700 with Secure Boot enabled. - Add rEFInd back at the request of many users. - Fixed a bug related to Tools button on GPT disk. Now you can install Grub2 Legacy on GPT disk. - Rearrange hot keys in order in main menu. - Updated Turkish language file. Thank you Tayfun Akkoyun. - Add the following ISOs to the supported list: - KMPE WinPE. - android-x86_64-9.0. - Arch Linux 2020. - TeraByte Image for UEFI. - TeraByte Image for DOS. - BootIt® UEFI. - BootIt® Bare Metal.
nguyentumine · Aug 14, 2020 · bf1e823 · bf1e823
1 parent 8d17ca4
commit bf1e823
Show file tree

Hide file tree

Showing 137 changed files with 3,527 additions and 122 deletions.
diff --git a/AIO/Tools/AIOCreator_x64.exe b/AIO/Tools/AIOCreator_x64.exe
diff --git a/AIO/Tools/Lang/tr.txt b/AIO/Tools/Lang/tr.txt
@@ -1,7 +1,7 @@
 ################################################################
 Dil	        :	Turkish
 Kredi		:	Erhan Kültür ([email protected]), Murat ATICI, Tayfun Akkoyun.
-Tarih		:	14.05.2017
+Tarih		:	09.08.2020
 Info		:	Lütfen satır ekleme, silme veya taşıma yapmayın, "%s" yi kaldırmayın.Kendi bildiriminizi göndermek veya herhangi bir sorunuz olmasını istiyorsanız, [email protected] adresine bir e-posta göndermeyi unutmayın. Yardım için teşekkürler!
 ################################################################
 
@@ -237,7 +237,7 @@ Eğer güncelleme yapacaksınız,güncellemeden önce %s sürücüsü üzerindek
 Disk alanından kazanmak için,bu dosya kopyalanmak yerine taşınacaktır.Emin misiniz?
 Grub2 yi Kur
 Eğer sürücü üzerinde disk birleştirme işlemi yaparsanız,bu durumuda Grub2 yi tekrar kurmanız/yüklemeniz gerekir.
-You can only integrate one version for this package. Click the Menu Editor button to delete the current version and re-integrate it. Or use the Partition Image Mapper.
-The free space left on this drive is not enough.
-Access is denied. Try disabling the antivirus software and try again.
-##### END #####
+Paketin yalnızca bir versiyonunu entegre edebilirsiniz. Paketin yeni versiyonunu entegre etmek için Menü Düzenle butonuna tıklayın,Menü Düzenle ekranında,paketin mevcut versiyonunu kaldırın ve yeni paketi tekrar kurun.Yada Part Image Mapper özelliğini kullanın.
+Bu sürücünün başındaki boş alan yeterli değil.
+Erişim engelleniyor.Lütfen mevcut antivirüs yazılımınızı pasif hale getirin ve tekrar deneyin.
+##### END #####
diff --git a/AIO/grub/FileManager.cfg b/AIO/grub/FileManager.cfg
@@ -11,7 +11,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-set k="_"
+set hotkey="_"
 echo ${scanpartmsg}
 for dev in (*); do
 	regexp -s device '\((.*)\)' $dev
@@ -38,7 +38,7 @@ for dev in (*); do
 	probe -s voluuid -u $device
 	if [ -z "$vollabel" ]; then set vollabel="${noname}"; fi
 	GetHotkey
-	submenu "[${k}] ${device} - ${vollabel} - ${fstype} - ${voluuid}" $device --hotkey="${k}" {
+	submenu "[${hotkey}] ${device} - ${vollabel} - ${fstype} - ${voluuid}" $device --hotkey="${hotkey}" {
 		FileManager "(${2})"
 	}
 	unset vollabel

diff --git a/AIO/grub/Main.cfg b/AIO/grub/Main.cfg
@@ -1,6 +1,9 @@
+set hotkey="_"
+
 source ${menudir}/Main.cfg;
 ### Start InstallWinISO
-menuentry "[k] ${installwiniso}" --hotkey=k {
+GetHotkey
+menuentry "[${hotkey}] ${installwiniso}" --hotkey=${hotkey} {
 	#unset ignore_fs_args
 	#unset ignore_dir_args
 	#export ignore_fs_args="fat procfs pyfs"
@@ -16,7 +19,8 @@ menuentry "[k] ${installwiniso}" --hotkey=k {
 }
 ### End InstallWinISO
 ### Start BootFrom
-menuentry "[d] ${bootfrom}" --hotkey=d {
+GetHotkey
+menuentry "[${hotkey}] ${bootfrom}" --hotkey=${hotkey} {
 	#unset fs_args
 	#unset ignore_fs_args
 	#unset ignore_dir_args
@@ -31,7 +35,8 @@ menuentry "[d] ${bootfrom}" --hotkey=d {
 }
 ### End BootFrom
 ### Start File Manager
-menuentry "[j] ${fm}" --hotkey=j {
+GetHotkey
+menuentry "[${hotkey}] ${fm}" --hotkey=${hotkey} {
 	if [ -n "$pc" ] -a [ -e /AIO/grubfm/loadfm ] -a [ -e /AIO/grubfm/grubfm.iso ]; then
 		linux	/AIO/grubfm/loadfm
 		initrd	/AIO/grubfm/grubfm.iso
@@ -46,104 +51,132 @@ menuentry "[j] ${fm}" --hotkey=j {
 }
 ### End File Manager
 ### Start WinOnHDD
-menuentry "[i] ${winhdd}" --hotkey=i {
+GetHotkey
+menuentry "[${hotkey}] ${winhdd}" --hotkey=${hotkey} {
 	WindowsDetect
 }
 ### End WinOnHDD
 ### Start OSHdd
-menuentry "[h] ${oshdd}" --hotkey=h {
+GetHotkey
+menuentry "[${hotkey}] ${oshdd}" --hotkey=${hotkey} {
 	configfile ${prefix}/OSHDD.cfg
 }
 ### End OSHdd
-### Start Others
-if [ -n "$pc" -a -z "$cd" -a -f  ${menudir}/Others.cfg ]; then
-	source ${menudir}/Others.cfg;
+### Start Custom
+if [ -e ${menudir}/Custom.cfg ]; then
+	source ${menudir}/Custom.cfg;
 fi
-### End Others
+### End Custom
 ### Start Grub4dos
 if [ -n "$pc" ]; then
-menuentry "[g] Grub4dos" --hotkey=g {
+GetHotkey
+menuentry "[${hotkey}] Grub4dos" --hotkey=${hotkey} {
 	grub4dosroot
 	set opt="debug off; root ${g4droot} > nul; configfile /AIO/Menu/Grub4dos.lst"
 	linux ${g4d_path}/grub.exe --config-file=${opt}
 }
 fi
 ### End Grub4dos
 if [ -n "$efi" -a -z "$cd" ]; then
-if [ xx64 = x$_SPEC_UEFI_ARCH ] -a [ -z "$cd" ]; then
+if [ xx64 = x$_SPEC_UEFI_ARCH ]; then
 ### Start Clover UEFI
-	menuentry "[l] Clover Bootloader" --hotkey=l {
+	GetHotkey
+	menuentry "[${hotkey}] Clover Bootloader" --hotkey=${hotkey} {
 		search --file --no-floppy --set=root /EFI/BOOT/EFIPART
 		chainloader /EFI/CLOVER/CLOVERX64.efi
 	}
 ### End Clover UEFI
 fi
+### Start refind
+	GetHotkey
+	menuentry "[${hotkey}] rEFInd" --hotkey=${hotkey} {
+		search --file --no-floppy --set=root /EFI/BOOT/EFIPART
+		chainloader /EFI/refind/refind_${_SPEC_UEFI_ARCH}.efi
+	}
+### End refind
 fi
 ### Start Partition Tools
-menuentry "[n] ${parttoolmenu}" --hotkey=n {
+GetHotkey
+menuentry "[${hotkey}] ${parttoolmenu}" --hotkey=${hotkey} {
 	configfile ${prefix}/PartitionTool.cfg
 }
 ### End Partition Tools
 ### Start Search Grub2 configfile
-menuentry "[q] ${searchcfgmenu}" --hotkey=q {
+GetHotkey
+menuentry "[${hotkey}] ${searchcfgmenu}" --hotkey=${hotkey} {
 	configfile ${prefix}/SearchGrub2Cfg.cfg
 }
 ### End Search Grub2 configfile
 ### Start Refresh
-menuentry "[u] ${f5}" --hotkey=u {
+GetHotkey
+menuentry "[${hotkey}] ${f5}" --hotkey=${hotkey} {
 	search --file --no-floppy --set=root /AIO/aioboot.com.html
 	set prefix="(${root})/AIO/grub"
 	unset bgloaded
 	configfile ${prefix}/grub.cfg
 }
 ### End Refresh
 ### Start halt
-menuentry "[w] ${halt}" --hotkey=w {
+GetHotkey
+menuentry "[${hotkey}] ${halt}" --hotkey=${hotkey} {
 	halt
 }
 ### End halt
 ### Start reboot
-menuentry "[x] ${reboot}" --hotkey=x {
+GetHotkey
+menuentry "[${hotkey}] ${reboot}" --hotkey=${hotkey} {
 	reboot
 }
 ### End reboot
 ### Start changeroot
-menuentry "[y] ${changeroot}" --hotkey=y {
+GetHotkey
+menuentry "[${hotkey}] ${changeroot}" --hotkey=${hotkey} {
 	configfile ${prefix}/ChangeRoot.cfg
 }
 ### End changeroot
 ### Start help
-submenu "[z] ${lhelp}" --hotkey=z {
-	menuentry "[1] ${about}" --hotkey=1 {
+GetHotkey
+submenu "[${hotkey}] ${lhelp}" --hotkey=${hotkey} {
+	set hotkey="_"
+	GetHotkey
+	menuentry "[${hotkey}] ${about}" --hotkey=${hotkey} {
 		helpmenu about
 	}
-	menuentry "[2] ${menu}" --hotkey=2 {
+	GetHotkey
+	menuentry "[${hotkey}] ${menu}" --hotkey=${hotkey} {
 		helpmenu menu
 	}
-	menuentry "[3] PartIMG Mapper" --hotkey=3 {
+	GetHotkey
+	menuentry "[${hotkey}] PartIMG Mapper" --hotkey=${hotkey} {
 		helpmenu partimg
 	}
-	menuentry "[4] ${bootfiles}" --hotkey=4 {
+	GetHotkey
+	menuentry "[${hotkey}] ${bootfiles}" --hotkey=${hotkey} {
 		helpmenu bootfiles
 	}
-	menuentry "[5] ${fm}" --hotkey=5 {
+	GetHotkey
+	menuentry "[${hotkey}] ${fm}" --hotkey=${hotkey} {
 		helpmenu filemanager
 	}
-	submenu "[6] ${bgmenu}" --hotkey=6 {
+	GetHotkey
+	submenu "[${hotkey}] ${bgmenu}" --hotkey=${hotkey} {
 		ChangeBackground
 	}
-	submenu "[7] ${langmenu}" --hotkey=7 {
+	GetHotkey
+	submenu "[${hotkey}] ${langmenu}" --hotkey=${hotkey} {
 		ChangeLanguage
 	}
 	if [ "$font" == "unicode-small" ]; then fontmenu="${largefont}"; else fontmenu="${smallfont}"; fi
-	menuentry "[8] ${fontmenu}" --hotkey=8 {
+	GetHotkey
+	menuentry "[${hotkey}] ${fontmenu}" --hotkey=${hotkey} {
 		if [ "$font" != "unicode-small" ]; then font=unicode-small;
 		elif [ -z "$lang" ]; then font=DejaVuSansMono-large; else font=unicode-large; fi
 		save_env font
 		unset bgloaded
 		configfile ${prefix}/grub.cfg
 	}
-	submenu "[9] Timeout" --hotkey=9 {
+	GetHotkey
+	menuentry "[${hotkey}] Timeout" --hotkey=${hotkey} {
 		echo "${timeoutmsg}:"
 		read time_out
 		if regexp '^[0-9]+([0-9]+)?$' "$time_out"; then

diff --git a/AIO/grub/PartitionTool.cfg b/AIO/grub/PartitionTool.cfg
@@ -12,7 +12,7 @@
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 echo ${scanpartmsg}
-set k="_"
+set hotkey="_"
 probe -p -s hdscheme $root
 regexp -s disknum "(.*),${hdscheme}" "$root"
 for dev in (${disknum},${hdscheme}*); do
@@ -23,7 +23,7 @@ for dev in (${disknum},${hdscheme}*); do
 	probe -s voluuid -u $device
 	if [ -z "$vollabel" ]; then set vollabel="${noname}"; fi
 	GetHotkey
-	submenu "[${k}] ${device} - ${vollabel} - ${fstype} - ${voluuid}" $device --hotkey="${k}" {
+	submenu "[${hotkey}] ${device} - ${vollabel} - ${fstype} - ${voluuid}" $device --hotkey="${hotkey}" {
 		menuentry "[1] ${cancel}" --hotkey=1 {
 			configfile ${prefix}/PartitionTool.cfg
 		}

diff --git a/AIO/grub/SearchGrub2Cfg.cfg b/AIO/grub/SearchGrub2Cfg.cfg
@@ -12,7 +12,7 @@
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 echo "${searchcfgmsg}"
-set k="_"
+set hotkey="_"
 for dev in (*); do
 	regexp -s device '\((.*)\)' $dev
 	probe -s fstype -f $device

diff --git a/AIO/grub/changeroot.cfg b/AIO/grub/changeroot.cfg
@@ -12,7 +12,7 @@
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 echo "${scanpartmsg}"
-set k="_"
+set hotkey="_"
 set saved_root=$root
 set saved_prefix=$prefix
 for dev in (*); do
@@ -26,7 +26,7 @@ for dev in (*); do
 	probe -s voluuid -u $device
 	if [ -z "$vollabel" ]; then set vollabel="${noname}"; fi
 	GetHotkey
-	menuentry "[${k}] ${device} - ${vollabel} - ${fstype} - ${voluuid}" $device --hotkey="${k}" {
+	menuentry "[${hotkey}] ${device} - ${vollabel} - ${fstype} - ${voluuid}" $device --hotkey="${hotkey}" {
 		set root="${2}"
 		set prefix="(${2})/AIO/grub"
 		configfile $prefix/grub.cfg