diff --git a/.gitignore b/.gitignore
index fa154b55..abeccecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/grubdiff2016/
 *~
 /TODO
 /ich9utils/
diff --git a/resources/grub/config/grub.cfg b/resources/grub/config/grub.cfg
index 37b83728..5cda2329 100644
--- a/resources/grub/config/grub.cfg
+++ b/resources/grub/config/grub.cfg
@@ -47,16 +47,25 @@ function try_user_config {
 }
 function search_grub {
 	echo -n "Attempting to load grub.cfg from: "
-	unset ddev
-	if [ (${1}?) != "(${1}?)" ]; then
-		ddev=(${1}*) # Both raw and partitioned devices
-	fi
-	for i in ${ddev}; do
-		echo -n "${i} "
-		try_user_config "${i}"
+	# TODO : Find a better way to detect how many disks
+	#	   : are on the computer instead of hardcoding.
+	# FIXME: Does this work on all boards?
+	for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
+		# TODO : Find a better way to detect how many partitions
+		#      : are on the disk instead of hardcoding.
+		echo "\nTrying disk ${1}${i}"
+		for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
+			# MBR/GPT partitions
+			echo "\nTrying partiton ${part}"
+			try_user_config "(${1}${i},${part})"
+		done
+		# raw devices
+		echo "\nTrying to boot to a raw disk ..."
+		try_user_config "(${1}${i})"
+		echo # Insert newline
 	done
-	echo # Insert newline
 }
+
 function try_isolinux_config {
 	set root="${1}"
 	for dir in '' /boot; do