projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use lowercase 'timeout' command in syslinux configuration [Closes: issue1262]
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
bef2dc2
..
ab0ad63
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-40,6
+40,7
@@
GRML_FLAVOURS = set() # which flavours are being installed?
GRML_DEFAULT = None
UUID = None
SYSLINUX_LIBS = "/usr/lib/syslinux/"
GRML_DEFAULT = None
UUID = None
SYSLINUX_LIBS = "/usr/lib/syslinux/"
+GPT_HEADER = "\x55\xaa\x45\x46\x49\x20\x50\x41\x52\x54" # original GPT header
RE_PARTITION = re.compile(r'([a-z/]*?)(\d+)$')
RE_P_PARTITION = re.compile(r'(.*?\d+)p(\d+)$')
RE_PARTITION = re.compile(r'([a-z/]*?)(\d+)$')
RE_P_PARTITION = re.compile(r'(.*?\d+)p(\d+)$')
@@
-318,9
+319,13
@@
def check_boot_flag(device):
boot_dev, x = get_device_from_partition(device)
with open(boot_dev, 'r') as image:
boot_dev, x = get_device_from_partition(device)
with open(boot_dev, 'r') as image:
- data = image.read(5
12
)
+ data = image.read(5
20
)
bootcode = data[440:]
bootcode = data[440:]
- if bootcode[6] == '\x80':
+ gpt_data = bootcode[70:80]
+
+ if gpt_data == GPT_HEADER:
+ logging.info("GPT detected, skipping bootflag check")
+ elif bootcode[6] == '\x80':
logging.debug("bootflag is enabled")
else:
logging.debug("bootflag is NOT enabled")
logging.debug("bootflag is enabled")
else:
logging.debug("bootflag is NOT enabled")
@@
-1379,7
+1384,7
@@
def handle_syslinux_config(grml_flavour, target):
# install main configuration only *once*, no matter how many ISOs we have:
syslinux_config_file = open(syslinux_cfg, 'w')
# install main configuration only *once*, no matter how many ISOs we have:
syslinux_config_file = open(syslinux_cfg, 'w')
- syslinux_config_file.write("
TIMEOUT
300\n")
+ syslinux_config_file.write("
timeout
300\n")
syslinux_config_file.write("include vesamenu.cfg\n")
syslinux_config_file.close()
syslinux_config_file.write("include vesamenu.cfg\n")
syslinux_config_file.close()