Merge libreboot-6b6.r20140903

Conflicts:
	buildrom-withgrub

15 files changed, 103 insertions, 495 deletions

diff --git a/resources/grub/config/COPYING b/resources/grub/config/COPYING
index 624c22d..05827f3 100644
--- a/resources/grub/config/COPYING
+++ b/resources/grub/config/COPYING
@@ -1,33 +1,18 @@
-The following files inside this directory:
+# GRUB configuration files under resources/grub/config/
 
- * grub_memdisk.cfg
- * macbook21/grub.cfg
- * macbook21/grub_dvorak.cfg
- * macbook21/grub_ukdvorak.cfg
- * macbook21/grub_ukqwerty.cfg
- * t60/grub.cfg
- * t60/grub_dvorak.cfg
- * t60/grub_ukdvorak.cfg
- * t60/grub_ukqwerty.cfg
- * t60/grub_serial.cfg
- * t60/grub_serial_dvorak.cfg
- * t60/grub_serial_ukdvorak.cfg
- * t60/grub_serial_ukqwerty.cfg
- * x60/grub.cfg
- * x60/grub_dvorak.cfg
- * x60/grub_ukdvorak.cfg
- * x60/grub_ukqwerty.cfg
- * x60/grub_serial.cfg
- * x60/grub_serial_dvorak.cfg
- * x60/grub_serial_ukdvorak.cfg
- * x60/grub_serial_ukqwerty.cfg
- * x60t/grub.cfg
- * x60t/grub_dvorak.cfg
- * x60t/grub_ukdvorak.cfg
- * x60t/grub_ukqwerty.cfg
- * x60t/grub_serial.cfg
- * x60t/grub_serial_dvorak.cfg
- * x60t/grub_serial_ukdvorak.cfg
- * x60t/grub_serial_ukqwerty.cfg
-
-Look inside each file for copyright information
+#
+#	Copyright (C) 2014 Francis Rowe
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
diff --git a/resources/grub/config/extra/common.cfg b/resources/grub/config/extra/common.cfg
new file mode 100644
index 0000000..09bd20a
--- /dev/null
+++ b/resources/grub/config/extra/common.cfg
@@ -0,0 +1,29 @@
+set prefix=(memdisk)/boot/grub
+
+insmod nativedisk
+insmod ehci
+insmod ohci
+insmod uhci
+insmod usb
+insmod usbserial_pl2303
+insmod usbserial_ftdi
+insmod usbserial_usbdebug
+
+# Serial and keyboard configuration, very important.
+serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+terminal_input --append  serial
+terminal_output --append serial
+terminal_input --append at_keyboard
+
+gfxpayload=keep
+terminal_output --append gfxterm
+
+# Default to first option, automatically boot after 1 second
+set default="0"
+set timeout=1
+
+# This is useful when using 'cat' on long files on GRUB terminal
+set pager=1
+
+# Play a beep on startup
+play 480 440 1
diff --git a/resources/grub/config/extra/txtmode.cfg b/resources/grub/config/extra/txtmode.cfg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/resources/grub/config/extra/txtmode.cfg
diff --git a/resources/grub/config/extra/vesafb.cfg b/resources/grub/config/extra/vesafb.cfg
new file mode 100644
index 0000000..bcad5cb
--- /dev/null
+++ b/resources/grub/config/extra/vesafb.cfg
@@ -0,0 +1,5 @@
+insmod jpeg
+
+background_image (cbfsdisk)/background.jpg
+loadfont (cbfsdisk)/dejavusansmono.pf2
+
diff --git a/resources/grub/config/grub_memdisk.cfg b/resources/grub/config/grub_memdisk.cfg
index fbac687..c9f22ff 100644
--- a/resources/grub/config/grub_memdisk.cfg
+++ b/resources/grub/config/grub_memdisk.cfg
@@ -1,28 +1,3 @@
-#
-#  configuration file for GRUB memdisk which sits inside the grub.elf payload included inside the ROM image
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Serial and keyboard configuration, very important.
-serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
-terminal_input --append  serial
-terminal_output --append serial
-terminal_input --append at_keyboard #add keyboard support.
-
 set prefix=(memdisk)/boot/grub
 
 set root='cbfsdisk'
diff --git a/resources/grub/config/macbook21/grub_usqwerty.cfg b/resources/grub/config/macbook21/grub_usqwerty.cfg
deleted file mode 100644
index 5f52384..0000000
--- a/resources/grub/config/macbook21/grub_usqwerty.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/gnulove.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
new file mode 100644
index 0000000..ec476fd
--- /dev/null
+++ b/resources/grub/config/menuentries/common.cfg
@@ -0,0 +1,43 @@
+menuentry 'Load Operating System' {
+	set root='ahci0,msdos1'
+	linux  /vmlinuz root=/dev/sda1
+	initrd /initrd.img
+}
+menuentry 'Parse ISOLINUX menu (USB)' {
+	set root='usb0'
+	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
+}
+menuentry 'Parse ISOLINUX menu (CD)' {
+	set root='ata0'
+	syslinux_configfile -i (ata0)/isolinux/isolinux.cfg
+}
+menuentry 'Load SeaBIOS' {
+	set root='cbfsdisk'
+	chainloader /bios.bin.elf
+}
+menuentry 'Switch to grubtest.cfg' {
+	set root='cbfsdisk'
+	configfile (cbfsdisk)/grubtest.cfg
+}
+menuentry 'Search for GRUB configuration on internal storage' {
+	insmod regexp
+	insmod ahci
+	insmod part_msdos
+	for x in (ahci0,*) ; do
+		if [ -f "$x/grub/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x { 
+				root=$2
+				source /grub/grub.cfg
+				unset superusers
+			}
+		fi
+		if [ -f "$x/boot/grub/grub.cfg" ] ; then
+			submenu "Load Config from $x" $x {
+				root=$2
+				source /boot/grub/grub.cfg
+				unset superusers
+			}
+		fi
+	done
+}
+
diff --git a/resources/grub/config/menuentries/txtmode.cfg b/resources/grub/config/menuentries/txtmode.cfg
new file mode 100644
index 0000000..087886e
--- /dev/null
+++ b/resources/grub/config/menuentries/txtmode.cfg
@@ -0,0 +1,9 @@
+menuentry 'Load GRUB Invaders' {
+	set root='cbfsdisk'
+	chainloader /invaders.exec
+}
+menuentry 'Load MemTest86+' {
+	set root='cbfsdisk'
+	chainloader /memtest
+}
+
diff --git a/resources/grub/config/menuentries/vesafb.cfg b/resources/grub/config/menuentries/vesafb.cfg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/resources/grub/config/menuentries/vesafb.cfg
diff --git a/resources/grub/config/t60/grub_serial_usqwerty.cfg b/resources/grub/config/t60/grub_serial_usqwerty.cfg
deleted file mode 100644
index 34ce198..0000000
--- a/resources/grub/config/t60/grub_serial_usqwerty.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Serial and keyboard configuration, very important.
-serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
-terminal_input --append  serial
-terminal_output --append serial
-terminal_input --append at_keyboard #add keyboard support.
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Parse ISOLINUX menu (CD)' {
-	set root='ata0'
-	syslinux_configfile -i (ata0)/isolinux/isolinux.cfg
-}
-menuentry 'Load MemTest86+ (serial port, baud 115200)' {
-	set root='cbfsdisk'
-	chainloader /memtest
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
diff --git a/resources/grub/config/t60/grub_usqwerty.cfg b/resources/grub/config/t60/grub_usqwerty.cfg
deleted file mode 100644
index 4fa2e43..0000000
--- a/resources/grub/config/t60/grub_usqwerty.cfg
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Parse ISOLINUX menu (CD)' {
-	set root='ata0'
-	syslinux_configfile -i (ata0)/isolinux/isolinux.cfg
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
diff --git a/resources/grub/config/x60/grub_serial_usqwerty.cfg b/resources/grub/config/x60/grub_serial_usqwerty.cfg
deleted file mode 100644
index 34ce198..0000000
--- a/resources/grub/config/x60/grub_serial_usqwerty.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Serial and keyboard configuration, very important.
-serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
-terminal_input --append  serial
-terminal_output --append serial
-terminal_input --append at_keyboard #add keyboard support.
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Parse ISOLINUX menu (CD)' {
-	set root='ata0'
-	syslinux_configfile -i (ata0)/isolinux/isolinux.cfg
-}
-menuentry 'Load MemTest86+ (serial port, baud 115200)' {
-	set root='cbfsdisk'
-	chainloader /memtest
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
diff --git a/resources/grub/config/x60/grub_usqwerty.cfg b/resources/grub/config/x60/grub_usqwerty.cfg
deleted file mode 100644
index cce7a44..0000000
--- a/resources/grub/config/x60/grub_usqwerty.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
diff --git a/resources/grub/config/x60t/grub_serial_usqwerty.cfg b/resources/grub/config/x60t/grub_serial_usqwerty.cfg
deleted file mode 100644
index 34ce198..0000000
--- a/resources/grub/config/x60t/grub_serial_usqwerty.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# Serial and keyboard configuration, very important.
-serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
-terminal_input --append  serial
-terminal_output --append serial
-terminal_input --append at_keyboard #add keyboard support.
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Parse ISOLINUX menu (CD)' {
-	set root='ata0'
-	syslinux_configfile -i (ata0)/isolinux/isolinux.cfg
-}
-menuentry 'Load MemTest86+ (serial port, baud 115200)' {
-	set root='cbfsdisk'
-	chainloader /memtest
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-
diff --git a/resources/grub/config/x60t/grub_usqwerty.cfg b/resources/grub/config/x60t/grub_usqwerty.cfg
deleted file mode 100644
index cce7a44..0000000
--- a/resources/grub/config/x60t/grub_usqwerty.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#  GRUB configuration file which sits inside the root CBFS (coreboot filesystem)
-#
-#	Copyright (C) 2014 Francis Rowe
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-set default="0"
-set timeout=1
-set pager=1
-
-background_image (cbfsdisk)/background.jpg
-loadfont (cbfsdisk)/dejavusansmono.pf2
-
-menuentry 'Load Operating System' {
-	linux  (ahci0,1)/vmlinuz root=/dev/sda1
-	initrd  (ahci0,1)/initrd.img
-}
-menuentry 'Parse ISOLINUX menu (USB)' {
-	set root='usb0'
-	syslinux_configfile -i (usb0)/isolinux/isolinux.cfg
-}
-menuentry 'Search for GRUB configuration on internal storage' {
-	insmod regexp
-	insmod ahci
-	insmod part_msdos
-	for x in (ahci0,*) ; do
-		if [ -f "$x/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x { 
-				root=$2
-				source /grub/grub.cfg
-				unset superusers
-			}
-		fi
-		if [ -f "$x/boot/grub/grub.cfg" ] ; then
-			submenu "Load Config from $x" $x {
-				root=$2
-				source /boot/grub/grub.cfg
-				unset superusers
-			}
-		fi
-	done
-}
-