summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-08-05 20:09:07 +0200
committeranonym <anonym@riseup.net>2015-08-05 20:09:07 +0200
commita2fd0ea3fddd79195673db01dd23f49a45ee7eb0 (patch)
treedcfb36e74ab74f40159dee038c1a83487e8b2663 /config/chroot_local-packageslists
parent4bf7742d903159a466b4512b23f99737c43d37d1 (diff)
parent0a4dd67c9d879895bf0ced9228d602eac4b5db61 (diff)
Merge remote-tracking branch 'origin/devel' into feature/jessie
Conflicts: features/images/I2P_router_console.png features/images/TailsInstallerNoDevice.png features/images/TorBrowserAddressBar.png features/images/USBSuggestsInstall.png features/images/UnsafeBrowserAdvancedSettings.png features/images/UnsafeBrowserEditPreferences.png features/images/UnsafeBrowserProxyRefused.png features/images/UnsafeBrowserWindow.png features/step_definitions/unsafe_browser.rb
Diffstat (limited to 'config/chroot_local-packageslists')
-rw-r--r--config/chroot_local-packageslists/tails-common.list1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 0515508..461df63 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -120,6 +120,7 @@ gobby-0.5
## breaks lb because of desktop-base.postinst (see Debian bug #467620)
#if ARCHITECTURE i386 amd64
# grub
+grub-efi-ia32
#endif
gstreamer0.10-plugins-base
gstreamer0.10-plugins-good