2 files changed, 18 insertions, 3 deletions
diff --git a/resources/grub/config/grub.cfg b/resources/grub/config/grub.cfg
index b03a1741..586eb145 100644
--- a/resources/grub/config/grub.cfg
+++ b/resources/grub/config/grub.cfg
@@ -29,8 +29,18 @@ set default="0"
 set timeout=30
 set pager=1
 set grub_scan_disk="both"
+if [ -f (cbfsdisk)/scan.cfg ]; then
+	source (cbfsdisk)/scan.cfg
+fi
+
+if [ -f (cbfsdisk)/keymap.gkb ]; then
+	keymap (cbfsdisk)/keymap.gkb
+elif [ -f (cbfsdisk)/keymap.cfg ]; then
+	source (cbfsdisk)/keymap.cfg
+else
+	keymap usqwerty
+fi
 
-keymap usqwerty
 function try_user_config {
 	set root="${1}"
 	for dir in boot grub grub2 boot/grub boot/grub2; do
@@ -165,12 +175,14 @@ menuentry 'Search ISOLINUX menu (USB)  [u]' --hotkey='u' {
 menuentry 'Search ISOLINUX menu (ATA/IDE)  [d]' --hotkey='d' {
 	search_isolinux ata
 }
+if [ -f (cbfsdisk)/grubtest.cfg ]; then
 menuentry 'Load test configuration (grubtest.cfg) inside of CBFS  [t]' --hotkey='t' {
 	set root='(cbfsdisk)'
 	if [ -f /grubtest.cfg ]; then
 		configfile /grubtest.cfg
 	fi
 }
+fi
 menuentry 'Search for GRUB2 configuration on external media  [s]' --hotkey='s' {
 	search_grub usb
 }
diff --git a/resources/grub/config/grub_memdisk.cfg b/resources/grub/config/grub_memdisk.cfg
index c9f22ff1..0763801b 100644
--- a/resources/grub/config/grub_memdisk.cfg
+++ b/resources/grub/config/grub_memdisk.cfg
@@ -1,4 +1,7 @@
 set prefix=(memdisk)/boot/grub
 
-set root='cbfsdisk'
-source (cbfsdisk)/grub.cfg
+if [ -f (cbfsdisk)/grub.cfg ]; then
+	source (cbfsdisk)/grub.cfg
+else
+	source (memdisk)/boot/grub/grub_default.cfg
+fi