import struct
# global variables
-PROG_VERSION = "0.9.27~git"
+PROG_VERSION = "0.9.28~git"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
GRML_FLAVOURS = set() # which flavours are being installed?
GRML_DEFAULT = None
UUID = None
+SYSLINUX_LIBS = "/usr/lib/syslinux/"
def syslinux_warning(option, opt, value, opt_parser):
"""A helper function for printing a warning about deprecated option
grub_device = device
logging.info("Installing grub as bootloader")
- logging.debug("grub-install --recheck --force --no-floppy --root-directory=%s %s",
- device_mountpoint, grub_device)
- proc = subprocess.Popen(["grub-install", "--recheck", "--force", "--no-floppy",
- "--root-directory=%s" % device_mountpoint, grub_device],
- stdout=file(os.devnull, "r+"))
- proc.wait()
+ for opt in ["", "--force" ]:
+ logging.debug("grub-install --recheck %s --no-floppy --root-directory=%s %s",
+ opt, device_mountpoint, grub_device)
+ proc = subprocess.Popen(["grub-install", "--recheck", opt, "--no-floppy",
+ "--root-directory=%s" % device_mountpoint, grub_device],
+ stdout=file(os.devnull, "r+"))
+ proc.wait()
+ if proc.returncode == 0:
+ break
+
if proc.returncode != 0:
# raise Exception("error executing grub-install")
logging.critical("Fatal: error executing grub-install "
@target: path of the target mount point
"""
grml_target = target + '/grml/'
- new_grml_version = search_file('grml-version', grml_target)
- if new_grml_version:
- orig_grml_version = search_file('grml-version', iso_mount)
- if not orig_grml_version:
- logging.warn("Warning: %s could not be found - can not install it", orig_grml_version)
+ target_grml_version_file = search_file('grml-version', grml_target)
+ if target_grml_version_file:
+ iso_grml_version_file = search_file('grml-version', iso_mount)
+ if not iso_grml_version_file:
+ logging.warn("Warning: %s could not be found - can not install it", iso_grml_version_file)
return False
try:
- new_file = open(new_grml_version, 'a+')
- new_flavours = [ get_flavour(l) for l in new_file.readlines() ]
-
- old_file = open(orig_grml_version, 'r')
- old_lines = old_file.readlines()
- for line in old_lines:
- if not get_flavour(line) in new_flavours:
- new_file.write(line)
+ iso_versions = {}
+ iso_file = open(iso_grml_version_file, 'r')
+ for line in iso_file:
+ iso_versions[get_flavour(line)] = line.strip()
+
+ for line in fileinput.input([target_grml_version_file], inplace=1):
+ flavour = get_flavour(line)
+ if flavour in iso_versions.keys():
+ print iso_versions[flavour]
+ else:
+ print line.strip()
except IOError:
logging.warn("Warning: Could not write file")
finally:
- new_file.close()
- old_file.close()
+ iso_file.close()
+ fileinput.close()
return True
else:
return False
if file_location is None:
logging.warn("Warning: %s not found (that's fine if you don't need it)", filename)
else:
- exec_rsync(file_location, dst + filename)
+ exec_rsync(file_location, dst)
def copy_addons(iso_mount, target):
for expr in name, 'distri.cfg', \
defaults_file, 'grml.png', 'hd.cfg', 'isolinux.cfg', 'isolinux.bin', \
'isoprompt.cfg', 'options.cfg', \
- 'prompt.cfg', 'vesamenu.c32', 'vesamenu.cfg', 'grml.png', '*.c32':
+ 'prompt.cfg', 'vesamenu.cfg', 'grml.png', '*.c32':
glob_and_copy(iso_mount + source_dir + expr, syslinux_target)
+ for filename in glob.glob1(syslinux_target, "*.c32"):
+ copy_if_exist(os.path.join(SYSLINUX_LIBS, filename), syslinux_target)
+
+
# copy the addons_*.cfg file to the new syslinux directory
glob_and_copy(iso_mount + source_dir + 'addon*.cfg', syslinux_target)
except CriticalException, error:
logging.critical("Fatal: %s", error)
raise
- global GRML_FLAVOURS
try:
grml_flavours = identify_grml_flavour(mountpoint)
for flavour in set(grml_flavours):
sys.exit(1)
+def check_programs():
+ """check if all needed programs are installed"""
+ if options.grub:
+ if not which("grub-install"):
+ logging.critical("Fatal: grub-install not available (please install the "
+ + "grub package or drop the --grub option)")
+ sys.exit(1)
+
+ if options.syslinux:
+ if not which("syslinux"):
+ logging.critical("Fatal: syslinux not available (please install the "
+ + "syslinux package or use the --grub option)")
+ sys.exit(1)
+
+ if not which("rsync"):
+ logging.critical("Fatal: rsync not available, can not continue - sorry.")
+ sys.exit(1)
+
def main():
"""Main function [make pylint happy :)]"""
if options.dryrun:
logging.info("Running in simulation mode as requested via option dry-run.")
+ check_programs()
+
# specified arguments
device = args[len(args) - 1]
isos = args[0:len(args) - 1]
logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)")
sys.exit(1)
- if options.grub:
- if not which("grub-install"):
- logging.critical("Fatal: grub-install not available (please install the "
- + "grub package or drop the --grub option)")
- sys.exit(1)
-
- if options.syslinux:
- if not which("syslinux"):
- logging.critical("Fatal: syslinux not available (please install the "
- + "syslinux package or use the --grub option)")
- sys.exit(1)
-
- if not which("rsync"):
- logging.critical("Fatal: rsync not available, can not continue - sorry.")
- sys.exit(1)
# provide upgrade path
handle_compat_warning(device)
projects / grml2usb.git / blobdiff