summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/binary_local-includes/EFI/BOOT/grub/grub.cfg52
-rw-r--r--wiki/src/support/known_issues.mdwn2
2 files changed, 5 insertions, 49 deletions
diff --git a/config/binary_local-includes/EFI/BOOT/grub/grub.cfg b/config/binary_local-includes/EFI/BOOT/grub/grub.cfg
index 69cdafd..7a5f5a7 100644
--- a/config/binary_local-includes/EFI/BOOT/grub/grub.cfg
+++ b/config/binary_local-includes/EFI/BOOT/grub/grub.cfg
@@ -16,51 +16,7 @@ set linux_gfx_mode=
export linux_gfx_mode
load_video
-menuentry "Tails64" {
- echo "Loading Linux..."
- linux /live/vmlinuz2 initrd=/live/initrd2.img boot=live config live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails
- echo "Loading initramfs..."
- initrd /live/initrd2.img
- echo "Booting..."
- boot
-}
-
-menuentry "Tails64failsafe" {
- echo "Loading Linux..."
- linux /live/vmlinuz2 initrd=/live/initrd2.img boot=live config live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 nosplash noautologin module=Tails nomodeset
- echo "Loading initramfs..."
- initrd /live/initrd2.img
- echo "Booting..."
- boot
-}
-
-menuentry "Tails32" {
- echo "Loading Linux..."
- linux /live/vmlinuz initrd=/live/initrd.img boot=live config live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails
- echo "Loading initramfs..."
- initrd /live/initrd.img
- echo "Booting..."
- boot
-}
-
-menuentry "Tails32failsafe" {
- echo "Loading Linux..."
- linux /live/vmlinuz initrd=/live/initrd.img boot=live config live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 nosplash noautologin module=Tails nomodeset
- echo "Loading initramfs..."
- initrd /live/initrd.img
- echo "Booting..."
- boot
-}
-
-menuentry "syslinux: liveamd64.cfg" {
- insmod syslinuxcfgfile
- echo "Loading syslinux configuration..."
- syslinux_configfile /efi/boot/liveamd64.cfg
-}
-
-menuentry "syslinux.cfg" {
- insmod syslinuxcfg
- insmod cpuid
- echo "Loading syslinux configuration..."
- syslinux_configfile /efi/boot/syslinux.cfg
-}
+insmod syslinuxcfg
+insmod cpuid
+echo "Loading syslinux configuration..."
+syslinux_configfile /efi/boot/syslinux.cfg
diff --git a/wiki/src/support/known_issues.mdwn b/wiki/src/support/known_issues.mdwn
index b3afbca..73534cc 100644
--- a/wiki/src/support/known_issues.mdwn
+++ b/wiki/src/support/known_issues.mdwn
@@ -192,7 +192,7 @@ Mac
* Some Mac need [rEFInd](http://sourceforge.net/projects/refind/)
installed to boot Tails from a USB stick.
-* Any Mac with 32-bit EFI won't succeed in booting Tails USB stick
+* Any Mac with 32-bit EFI may not succeed in booting Tails USB stick
created by Tails Installer. You can check if a given Mac is 32-bit
or 64-bit EFI on that list:
<http://www.everymac.com/mac-answers/snow-leopard-mac-os-x-faq/mac-os-x-snow-leopard-64-bit-macs-64-bit-efi-boot-in-64-bit-mode.html>