v0.9.9.15

AIO/grub/Main.cfg

@@ -4,21 +4,25 @@ source ${menudir}/Main.cfg;
 ### Start InstallWinISO
 GetHotkey
 menuentry "${installwiniso}" --hotkey=${hotkey} {
-	#unset ignore_fs_args
-	#unset ignore_dir_args
-	#export ignore_fs_args="fat procfs pyfs"
-	#export ignore_dir_args="procfs pyfs"
-	unset pim
-	unset fs_args
-	unset file_ext_args
-	unset file_in_loop_args
-	export fs_args="fat ntfs exfat"
-	export file_ext_args="iso"
-	export file_in_loop_args="/sources/install.wim /x64/sources/install.esd /x86/sources/install.esd /sources/install.esd"
-	if [ -n "$pc" ]; then
-		export file_in_loop_args="${file_in_loop_args} /I386/TXTSETUP.SIF /AMD64/TXTSETUP.SIF"
+	if [ "x${secureboot}" == "xON" ]; then
+		esc 1 "${sbenabledmsg}"
+	else
+		#unset ignore_fs_args
+		#unset ignore_dir_args
+		#export ignore_fs_args="fat procfs pyfs"
+		#export ignore_dir_args="procfs pyfs"
+		unset pim
+		unset fs_args
+		unset file_ext_args
+		unset file_in_loop_args
+		export fs_args="fat ntfs exfat"
+		export file_ext_args="iso"
+		export file_in_loop_args="/sources/install.wim /x64/sources/install.esd /x86/sources/install.esd /sources/install.esd"
+		if [ -n "$pc" ]; then
+			export file_in_loop_args="${file_in_loop_args} /I386/TXTSETUP.SIF /AMD64/TXTSETUP.SIF"
+		fi
+		configfile ${prefix}/FileManager.cfg
 	fi
-	configfile ${prefix}/FileManager.cfg
 }
 ### End InstallWinISO
 ### Start ISO & IMG Mapper
@@ -120,15 +124,19 @@ menuentry "${searchcfgmenu}" --hotkey=${hotkey} {
 	configfile ${prefix}/SearchGrub2Cfg.cfg
 }
 ### End Search Grub2 configfile
+### Start Disable Secure Boot
+if [ "x${secureboot}" == "xON" ]; then
+GetHotkey
+menuentry "${disablesb}" --hotkey=${hotkey} {
+	efiload -n /efi/drivers/fucksb_${_SPEC_UEFI_ARCH}.efi
+	Refresh
+}
+fi
+### End Disable Secure Boot
 ### Start Refresh
 GetHotkey
 menuentry "${f5}" --hotkey=${hotkey} {
-	search --file --no-floppy --set=root /AIO/aioboot.com.html
-	if [ -n "${efi}" ]; then
-		chainloader /efi/boot/boot${_SPEC_UEFI_ARCH}.efi
-	else
-		multiboot /aio/grub/i386-pc/core.img
-	fi
+	Refresh
 }
 ### End Refresh
 ### Start halt

AIO/grub/Settings.cfg

@@ -104,4 +104,5 @@ menuentry "${timeoutmenu}" --hotkey=${hotkey} {
 	fi
 	esc 2
 	unset time_out
-}
+}
+ReturnMainMenu

AIO/grub/functions.cfg

@@ -248,37 +248,6 @@ function freebsd_zfs_variants {
 	fi
 }
 
-function drivemap_to_hd0 {
-	if [ -z "$1" ]; then
-		set _device="${root}"
-	else
-		set _device="${1}"
-	fi
-	if ! regexp -s _disknum '^\(?hd([0-9]+)' "$_device"; then
-		esc 1 "Only hard disks are supported."
-		return 1
-	fi
-	if [ "$_disknum" == "0" ]; then
-		return 0
-	elif [ "$_disknum" == "1" ]; then
-		drivemap -s (hd0) (hd1)
-	else
-		drivemap -s (hd${_disknum}) (hd0)
-		set _newdisknum="$_disknum"
-		while [ "x${_disknum}" != "x1" ]; do
-			decrement _disknum
-			drivemap -s (hd${_newdisknum}) (hd${_disknum})
-			set _newdisknum=${_disknum}
-		done
-		drivemap (hd0) (hd1)
-		unset _newdisknum
-	fi
-	unset _disknum
-	unset _device
-	return 0
-}
-
-
 function drivemap_hd0_to_hdn {
 	GetDiskPartNum
 	if [ "${disknum}" == "0" ]; then
@@ -291,12 +260,14 @@ function drivemap_hd0_to_hdn {
 				fi
 			fi
 		done
-		drivemap (hd0) ${_disk}
+		if [ "(hd0)" != "${_disk}" ] -a [ "(hd1)" != "${_disk}" ]; then
+			drivemap (hd0) ${_disk}
+		fi
 		regexp -s disk_n '^\(hd(.*)\)$' "$_disk"
 		unset _disk
 		unset _next_disk
 	else
-		set disk_n="0"
+		set disk_n="${disknum}"
 	fi
 }
 
@@ -337,6 +308,10 @@ function ntbootcmd {
 		terminal_output console
 		ntboot ${_args} --efi=/AIO/Tools/MS/PXE/bootmgr "${_file}"
 	else
+		if [ "x${secureboot}" == "xON" ]; then
+			esc 1 "${sbenabledmsg}"
+			return 1
+		fi
 		if [ "$_file_ext" == "wim" ]; then
 			if wimtools --is64 "${_file}"; then set wimarch="64"; else set wimarch="32"; fi
 			if [ "$_SPEC_UEFI_ARCH_3" != "$wimarch" ]; then
@@ -371,6 +346,10 @@ function wimbootwinsetup {
 			@:Winpeshl.ini:/AIO/Tools/winsetup/Winpeshl.ini		\
 			@:boot.wim:"${1}"
 	else
+		if [ "x${secureboot}" == "xON" ]; then
+			esc 1 "${sbenabledmsg}"
+			return 1
+		fi
 		if [ "$_SPEC_UEFI_ARCH_3" != "$wimarch" ]; then
 			esc 1 "$efi3264msg"
 			return 1
@@ -885,12 +864,16 @@ function FileProcessing {
 		for cfg in /boot/grub/loopback.cfg /efi/boot/loopback.cfg /EFI/BOOT/loopback.cfg; do
 			if ! test -e (isoloop)$cfg; then continue; fi
 			cat -s cfgtext (isoloop)$cfg
-			if regexp ' /grub/grub.cfg' "$cfgtext"; then
+			if regexp " /grub/grub.cfg" "$cfgtext"; then
 				if ! test -e (isoloop)/grub/grub.cfg; then continue; fi
 			fi
-			if regexp '/casper/initrd.lz' "$cfgtext"; then
+			if regexp "/casper/initrd.lz" "$cfgtext"; then
 				if ! test -e (isoloop)/casper/initrd.lz; then continue; fi
 			fi
+			if regexp "source /boot/grub/grub.cfg" "$cfgtext"; then
+				cat -s new_cfgtext (isoloop)/boot/grub/grub.cfg
+				if ! regexp 'iso_path' "$new_cfgtext"; then continue; fi
+			fi
 
 			probe -u -s rootuuid $loopdev
 			export rootuuid
@@ -1281,4 +1264,13 @@ function wimbooting {
 		linux16 ${g4d_path}/grub.exe --config-file=${opt}
 		boot
 	fi
+}
+
+function Refresh {
+	search --file --no-floppy --set=root /AIO/aioboot.com.html
+	if [ -n "${efi}" ]; then
+		chainloader /efi/boot/boot${_SPEC_UEFI_ARCH}.efi
+	else
+		multiboot /aio/grub/i386-pc/core.img
+	fi
 }

AIO/grub/grub.cfg

@@ -21,7 +21,6 @@ if [ -z "$grub_enable_menu_hotkey" ]; then
 fi
 
 if [ "${grub_platform}" == "efi" ]; then
-	set modules="gfxmenu part_acorn part_apple part_bsd part_dfly part_dvh part_plan part_sun part_sunpc"
 	export efi=1
 	if [ "${grub_cpu}" == "x86_64" ]; then
 		export _SPEC_UEFI_ARCH="x64"
@@ -32,24 +31,17 @@ if [ "${grub_platform}" == "efi" ]; then
 		export _SPEC_UEFI_ARCH_2="86"
 		export _SPEC_UEFI_ARCH_3="32"
 	fi
-	if [ x"$secureboot" == xON ] -a [ -z "$fucksb_done" ]; then
-		sbpolicy -i
-		fucksb -i
-		fucksb --off
-		export fucksb_done="?"
-	fi
 elif [ "${grub_platform}" == "pc" ]; then
 	set modules="gfxmenu search linux linux16 afs bfs ext2 f2fs hfs hfsplus iso9660 jfs part_acorn part_apple part_bsd part_dfly part_dvh part_plan part_sun part_sunpc udf ufs1 ufs1_be ufs2 xfs zfs sfs progress"
+	for module in ${modules}; do
+		insmod ${module}
+	done
+	unset modules
 	export pc=1
 	export memdisk="(${root})/AIO/Tools/memdisk"
 	export g4d_path="(${root})/AIO/Tools/grub4dos"
 fi
 
-for module in ${modules}; do
-	insmod ${module}
-done
-unset modules
-
 if [ "${next_entry}" ] ; then
    set default="${next_entry}"
    set next_entry=

AIO/grub/i386-efi/moddep.lst

@@ -135,7 +135,7 @@ pata: ata
 mul_test: functional_test
 adler32: crypto
 terminal:
-shim_lock: verifiers
+shim_lock: sbpolicy verifiers
 div:
 ehci: cs5536 usb boot
 crypto:
@@ -172,10 +172,10 @@ strtoull_test: functional_test
 bitmap:
 ntfs: fshelp
 multiboot: net linux video boot relocator mmap
-wimboot: lua map sbpolicy extcmd normal procfs xzio
+wimboot: lua map extcmd normal procfs xzio
 tpm: verifiers
 gcry_crc: crypto
-efiload: extcmd
+efiload: sbpolicy linuxefi extcmd
 png: bufio bitmap
 json:
 jpeg: bufio bitmap
@@ -290,8 +290,8 @@ lzmaio:
 ufs1:
 mdraid09: diskfilter
 lvm: diskfilter
-chain: net extcmd efinet normal boot
 cbfs: archelp
+chain: net sbpolicy linuxefi extcmd efinet normal boot
 ufs2:
 time:
 setpci: extcmd

AIO/grub/locale/Lang.cfg

@@ -122,4 +122,6 @@ export hotkeymenu
 export setdefaultmsg
 export getkeymsg
 export vmmsg
-export reinstallgrub2msg
+export reinstallgrub2msg
+export disablesb
+export sbenabledmsg

AIO/grub/locale/en.cfg

@@ -39,6 +39,7 @@ set disable="Disable"
 set bootfrom="Boot from ISO, WIM & VHD"
 set installwiniso="Install Windows from ISO"
 set settings="Settings"
+set disablesb="Disable Secure Boot for this session"
 
 ### Help Menu
 set menu="Menu"
@@ -118,4 +119,5 @@ set nobootablemsg="Unable to support booting this file!"
 set setdefaultmsg="For the next step, choose whichever entry you want to set as the default."
 set getkeymsg="Press [1] to continue. Press any other key to return."
 set vmmsg="This does not support running on virtual machines. Please use real machine."
-set reinstallgrub2msg="You must reinstall Grub2 to use this feature.\nAIOCreator.exe -> Bootloaders -> Grub2."
+set reinstallgrub2msg="You must reinstall Grub2 to use this feature.\nAIOCreator.exe -> Bootloaders -> Grub2."
+set sbenabledmsg="This function does not work with Secure Boot enabled.\nPlease consider disabling Secure Boot then try again."