Merge pull request #88 from grml/zeha/blackupdate

zeha · web-flow · commit 4aae906b09d0 · 2026-01-26T09:24:30.000+01:00
diff --git a/grml2usb b/grml2usb
@@ -1259,8 +1259,8 @@ def copy_bootloader_files(iso_mount, target, grml_flavour):
         if os.path.isfile(syslinux_target + "ldlinux.sys"):
             os.unlink(syslinux_target + "ldlinux.sys")
 
-        (source_dir, name) = get_defaults_file(iso_mount, grml_flavour, "default.cfg")
-        (source_dir, defaults_file) = get_defaults_file(
+        source_dir, name = get_defaults_file(iso_mount, grml_flavour, "default.cfg")
+        source_dir, defaults_file = get_defaults_file(
             iso_mount, grml_flavour, "grml.cfg"
         )
 

Original file line number	Diff line number	Diff line change
`@@ -1259,8 +1259,8 @@ def copy_bootloader_files(iso_mount, target, grml_flavour):`
`1259`	`1259`	`if os.path.isfile(syslinux_target + "ldlinux.sys"):`
`1260`	`1260`	`os.unlink(syslinux_target + "ldlinux.sys")`
`1261`	`1261`
`1262`		`- (source_dir, name) = get_defaults_file(iso_mount, grml_flavour, "default.cfg")`
`1263`		`- (source_dir, defaults_file) = get_defaults_file(`
	`1262`	`+ source_dir, name = get_defaults_file(iso_mount, grml_flavour, "default.cfg")`
	`1263`	`+ source_dir, defaults_file = get_defaults_file(`
`1264`	`1264`	`iso_mount, grml_flavour, "grml.cfg"`
`1265`	`1265`	`)`
`1266`	`1266`