Merge branch 'master' into ss15

538b33b2 · Christopher · f9f86efe · c9c57f34 · 538b33b2
Commit 538b33b2 authored Mar 21, 2015 by Christopher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

grub/grub.cfg grub/grub.cfg +1 -1

No files found.
--- a/grub/grub.cfg
+++ b/grub/grub.cfg
@@ -146,7 +146,7 @@ menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (english, lo
 }

 menuentry "Tool: Memtest86+" {
-  loopback loop ($root)/gparted-live-i486.iso
+  loopback loop ($root)/gparted-live-i686.iso
  echo     "Loading memtest"
  linux16  (loop)/live/memtest
  echo 	   "Starting Memtest86Plus"