summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2014-05-13 12:55:15 +0200
committerTails developers <tails@boum.org>2014-05-13 12:55:15 +0200
commitdbb686bf80637b5eb5c6a34741726ddb0187090b (patch)
treebc41451d2fd64bed4da8f60dbf954bd35b962104
parent804807325ba5011f6a0e21fd7e1c90644722b317 (diff)
parentf5a6aa090533ff892000193ee9ae05f778a51f45 (diff)
Merge remote-tracking branch 'origin/feature/uefi'
-rwxr-xr-xliveusb/creator.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 5fbf8a0..0c48894 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -49,8 +49,7 @@ from liveusb.config import config
from liveusb.source import SourceError
#XXX: size should be configurable
-SYSTEM_PARTITION_FLAGS = [ #XXX: not until we ship an UEFI bootloader
- #0, # system partition
+SYSTEM_PARTITION_FLAGS = [ 0, # system partition
2, # legacy BIOS bootable
60, # read-only
62, # hidden
@@ -234,7 +233,7 @@ class LiveUSBCreator(object):
# new partition (first), starts at begining, with given MiB size
'--new=1:0:+%dM' % self.system_partition_size,
# first part, set type 8301 (Linux reserved)
- '--typecode=1:8301',
+ '--typecode=1:EF00',
# first part, set label
'--change-name=%s' % self.label,
self.drive['device']
@@ -442,6 +441,8 @@ class LiveUSBCreator(object):
self.get_liveos_file_path("isolinux", "stdmenu.cfg")),
(self.get_liveos_file_path("isolinux", "exithelp.cfg"),
self.get_liveos_file_path("isolinux", "exithelp.cfg")),
+ (self.get_liveos_file_path("EFI", "BOOT", "isolinux.cfg"),
+ self.get_liveos_file_path("EFI", "BOOT", "syslinux.cfg")),
(grubconf, bootconf)]
copies = [(bootconf, grubconf),
(bootconf, bootx64conf),
@@ -850,7 +851,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
offset = 0
size = self.system_partition_size * 2**20
- partition_type = '8DA63339-0007-60C0-C436-083AC8230908'
+ partition_type = 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B'
label = self.label
flags = dbus.Array(signature='s')
options = dbus.Array(signature='s')
@@ -1086,7 +1087,9 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
def _get_mbr_bin(self):
mbr = None
- for mbr_bin in ('/usr/lib/syslinux/gptmbr.bin',
+ for mbr_bin in ('/usr/lib/syslinux/mbr/gptmbr.bin',
+ '/usr/lib/SYSLINUX/gptmbr.bin',
+ '/usr/lib/syslinux/gptmbr.bin',
'/usr/share/syslinux/gptmbr.bin'):
if os.path.exists(mbr_bin):
mbr = mbr_bin