summaryrefslogtreecommitdiffstats
path: root/config/binary_local-includes/EFI/BOOT/grub/grub.cfg
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-07 22:19:13 +0000
committerintrigeri <intrigeri@boum.org>2015-07-07 22:19:13 +0000
commit465b03f968a60529fa5b02eeb8b98387a0cd30c9 (patch)
tree3ce86a4b9dd12a8b3365db6b05e64d63510e2f10 /config/binary_local-includes/EFI/BOOT/grub/grub.cfg
parent867270aff031614a352b4a0b1f43ae6970c1338c (diff)
parent7c38f9fc21f26c84e38654ffa7083b52cc85e493 (diff)
Merge branch 'feature/8471-32-bit-UEFI' into feature/jessie+32-bit-UEFIfeature/jessie+32-bit-UEFI
Diffstat (limited to 'config/binary_local-includes/EFI/BOOT/grub/grub.cfg')
-rw-r--r--config/binary_local-includes/EFI/BOOT/grub/grub.cfg52
1 files changed, 4 insertions, 48 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