help="format specified partition with FAT16")
parser.add_option("--force", dest="force", action="store_true",
help="force any actions requiring manual interaction")
help="format specified partition with FAT16")
parser.add_option("--force", dest="force", action="store_true",
help="force any actions requiring manual interaction")
parser.add_option("--grub-mbr", dest="grubmbr", action="store_true",
help="install grub into MBR instead of (default) PBR")
parser.add_option("--lilo-binary", dest="lilobin", action="store", type="string",
parser.add_option("--grub-mbr", dest="grubmbr", action="store_true",
help="install grub into MBR instead of (default) PBR")
parser.add_option("--lilo-binary", dest="lilobin", action="store", type="string",
parser.add_option("--skip-syslinux-config", dest="skipsyslinuxconfig", action="store_true",
help="skip generation of syslinux configuration files")
parser.add_option("--syslinux", dest="syslinux", action="store_true",
parser.add_option("--skip-syslinux-config", dest="skipsyslinuxconfig", action="store_true",
help="skip generation of syslinux configuration files")
parser.add_option("--syslinux", dest="syslinux", action="store_true",
parser.add_option("--syslinux-mbr", dest="syslinuxmbr", action="store_true",
help="install syslinux master boot record (MBR) instead of default")
parser.add_option("--verbose", dest="verbose", action="store_true",
parser.add_option("--syslinux-mbr", dest="syslinuxmbr", action="store_true",
help="install syslinux master boot record (MBR) instead of default")
parser.add_option("--verbose", dest="verbose", action="store_true",
- try:
- install_syslinux(device)
- except CriticalException, error:
- logging.critical("Fatal: %s", error)
- cleanup()
- sys.exit(1)
- else:
+ logging.info("Note: the --syslinux option is deprecated as syslinux is grml2usb's default. Continuing anyway.")
+
+ if options.grub:
if not which("grub-install"):
logging.critical("Fatal: grub-install not available (please install the grub package or use the --syslinux option)")
cleanup()
if not which("grub-install"):
logging.critical("Fatal: grub-install not available (please install the grub package or use the --syslinux option)")
cleanup()
# lilo's mbr is broken, use the one from syslinux instead:
if not os.path.isfile("/usr/lib/syslinux/mbr.bin"):
# lilo's mbr is broken, use the one from syslinux instead:
if not os.path.isfile("/usr/lib/syslinux/mbr.bin"):
bootsplash = search_file(ffile, iso_mount)
exec_rsync(bootsplash, syslinux_target + ffile)
bootsplash = search_file(ffile, iso_mount)
exec_rsync(bootsplash, syslinux_target + ffile)
+ if not search_file('default.cfg', iso_mount + '/boot/isolinux/'):
+ logging.critical("Fatal: file default.cfg could not be found.")
+ logging.critical("Note: this grml2usb version requires an ISO generated by grml-live >=0.9.24 ...")
+ logging.critical(" ... either use grml releases >=2009.10 or switch to an older grml2usb version.")
+ raise
+
for filename in 'addons.cfg', 'default.cfg', 'distri.cfg', 'hidden.cfg', \
'grml.cfg', 'grml.png', 'hd.cfg', 'isoprompt.cfg', 'options.cfg', \
'vesamenu.c32', 'vesamenu.cfg', 'grml.png':
for filename in 'addons.cfg', 'default.cfg', 'distri.cfg', 'hidden.cfg', \
'grml.cfg', 'grml.png', 'hd.cfg', 'isoprompt.cfg', 'options.cfg', \
'vesamenu.c32', 'vesamenu.cfg', 'grml.png':
def adjust_syslinux_bootoptions(src_name, dst_name, flavour):
append_re = re.compile("^(\s*append.*)$", re.I)
def adjust_syslinux_bootoptions(src_name, dst_name, flavour):
append_re = re.compile("^(\s*append.*)$", re.I)
flavour_re = re.compile("(label.*)(grml\w+)")
default_re = re.compile("(default.cfg)")
src = open(src_name, "r")
flavour_re = re.compile("(label.*)(grml\w+)")
default_re = re.compile("(default.cfg)")
src = open(src_name, "r")