This script installs a grml system (either a running system or ISO[s]) to a USB device
-:copyright: (c) 2009 by Michael Prokop <mika@grml.org>
+:copyright: (c) 2009, 2010, 2011 by Michael Prokop <mika@grml.org>
:license: GPL v2 or any later version
:bugreports: http://grml.org/bugs/
import struct
# global variables
-PROG_VERSION = "0.9.29"
+PROG_VERSION = "0.9.30"
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")
set gfxmode=640x480
insmod gfxterm
insmod vbe
- if terminal_output.gfxterm ; then true ; else
+ if terminal_output gfxterm ; then true ; else
# For backward compatibility with versions of terminal.mod that don't
# understand terminal_output
terminal gfxterm
@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