import struct
# global variables
-PROG_VERSION = "0.9.30"
+PROG_VERSION = "0.9.31"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
# pylint: disable-msg=W0603
parser = OptionParser(usage=USAGE)
parser.add_option("--bootoptions", dest="bootoptions",
- action="store", type="string",
+ action="append", type="string",
help="use specified bootoptions as default")
parser.add_option("--bootloader-only", dest="bootloaderonly", action="store_true",
help="do not copy files but just install a bootloader")
exec_rsync(grml_file, grml_webimg_target + myfile)
-def handle_addon_copy(filename, dst, iso_mount):
+def handle_addon_copy(filename, dst, iso_mount, ignore_errors=False):
"""handle copy of optional addons
@filename: filename of the addon
@dst: destination directory
@iso_mount: location of the iso mount
+ @ignore_errors: don't report missing files
"""
file_location = search_file(filename, iso_mount)
if file_location is None:
- logging.warn("Warning: %s not found (that's fine if you don't need it)", filename)
+ if not ignore_errors:
+ logging.warn("Warning: %s not found (that's fine if you don't need it)", filename)
else:
exec_rsync(file_location, dst)
# memtest86+ image
handle_addon_copy('memtest', addons, iso_mount)
- # gpxe.lkrn
- handle_addon_copy('gpxe.lkrn', addons, iso_mount)
+ # gpxe.lkrn: got replaced by ipxe
+ handle_addon_copy('gpxe.lkrn', addons, iso_mount, ignore_errors=True)
+ # ipxe.lkrn
+ handle_addon_copy('ipxe.lkrn', addons, iso_mount)
def glob_and_copy(filepattern, dst):
"""Glob on specified filepattern and copy the result to dst
@grml_flavour: name of the grml_flavour
"""
# do NOT write "None" in kernel cmdline
- if options.bootoptions is None:
+ if not options.bootoptions:
bootopt = ""
else:
- bootopt = options.bootoptions
+ bootopt = " ".join(options.bootoptions)
bootopt = bootopt.replace("%flavour", grml_flavour)
return bootopt