projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix path to syslinux *.c32 files
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
3585976
..
2103bb9
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-41,7
+41,7
@@
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifie
GRML_FLAVOURS = set() # which flavours are being installed?
GRML_DEFAULT = None
UUID = None
GRML_FLAVOURS = set() # which flavours are being installed?
GRML_DEFAULT = None
UUID = None
-SYSLINUX_LIBS = "/usr/lib/syslinux/"
+SYSLINUX_LIBS = "/usr/lib/syslinux/
modules/bios/
"
GPT_HEADER = b"\x55\xaa\x45\x46\x49\x20\x50\x41\x52\x54" # original GPT header
GRUB_INSTALL = None
GPT_HEADER = b"\x55\xaa\x45\x46\x49\x20\x50\x41\x52\x54" # original GPT header
GRUB_INSTALL = None
@@
-389,7
+389,7
@@
def check_boot_flag(device):
except ImportError as e:
logging.debug("could not import parted, falling back to old bootflag detection")
except ImportError as e:
logging.debug("could not import parted, falling back to old bootflag detection")
- with open(boot_dev, 'r') as image:
+ with open(boot_dev, 'r
b
') as image:
data = image.read(520)
bootcode = data[440:]
gpt_data = bootcode[70:80]
data = image.read(520)
bootcode = data[440:]
gpt_data = bootcode[70:80]
@@
-790,7
+790,7
@@
def check_for_fat(partition):
try:
udev_info = subprocess.Popen(["/sbin/blkid", "-s", "TYPE", "-o", "value", partition],
try:
udev_info = subprocess.Popen(["/sbin/blkid", "-s", "TYPE", "-o", "value", partition],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE
, text=True
)
filesystem = udev_info.communicate()[0].rstrip()
if filesystem != "vfat":
filesystem = udev_info.communicate()[0].rstrip()
if filesystem != "vfat":