import struct
# global variables
-PROG_VERSION = "0.9.26"
+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
"""A helper function for printing a warning about deprecated option
"""
# pylint: disable-msg=W0613
- sys.stderr.write("Note: the --syslinux option is deprecated as syslinux " +
+ sys.stderr.write("Note: the --syslinux option is deprecated as syslinux "
"is grml2usb's default. Continuing anyway.\n")
setattr(opt_parser.values, option.dest, True)
@partition: device name of partition"""
+ if not os.access(partition, os.R_OK):
+ raise CriticalException("Failed to read device %s"
+ " (wrong UID/permissions or device/directory not present?)" % partition)
+
try:
udev_info = subprocess.Popen(["/sbin/blkid", "-s", "TYPE", "-o", "value", partition],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
filesystem = udev_info.communicate()[0].rstrip()
- if udev_info.returncode == 2:
- raise CriticalException("Failed to read device %s"
- " (wrong UID/permissions or device/directory not present?)" % partition)
-
if filesystem != "vfat":
raise CriticalException(
- "Partition %s does not contain a FAT16 filesystem." % (partition) \
- + "(Use --fat16 or run mkfs.vfat %s)" % (partition))
+ "Partition %s does not contain a FAT16 filesystem. "
+ "(Use --fat16 or run mkfs.vfat %s)" % (partition, partition))
except OSError:
raise CriticalException("Sorry, /sbin/blkid not available (install e2fsprogs?)")
@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 filename and (os.path.isfile(filename) or os.path.isdir(filename)):
exec_rsync(filename, dst)
-def copy_bootloader_files(iso_mount, target):
+def copy_bootloader_files(iso_mount, target, grml_flavour):
"""Copy grml's bootloader files to a given target
@iso_mount: path where a grml ISO is mounted on
- @target: path where grml's main files should be copied to"""
+ @target: path where grml's main files should be copied to
+ @grml_flavour: name of the current processed grml_flavour
+ """
syslinux_target = target + '/boot/syslinux/'
execute(mkdir, syslinux_target)
if os.path.isfile(syslinux_target + 'ldlinux.sys'):
os.unlink(syslinux_target + 'ldlinux.sys')
- (source_dir, name) = get_defaults_file(iso_mount, GRML_DEFAULT, "default.cfg")
- (source_dir, defaults_file) = get_defaults_file(iso_mount, GRML_DEFAULT, "grml.cfg")
+ (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")
if not source_dir:
logging.critical("Fatal: file default.cfg could not be found.")
@target: path where grml's main files should be copied to"""
global GRML_DEFAULT
- GRML_DEFAULT = grml_flavour
+ GRML_DEFAULT = GRML_DEFAULT or grml_flavour
if options.dryrun:
return 0
elif not options.bootloaderonly:
copy_addons(iso_mount, target)
if not options.copyonly:
- copy_bootloader_files(iso_mount, target)
+ copy_bootloader_files(iso_mount, target, grml_flavour)
if not options.dryrun:
handle_bootloader_config(grml_flavour, device, target)
for flavour in set(grml_flavours):
logging.info("Identified grml flavour \"%s\".", flavour)
install_iso_files(flavour, mountpoint, device, device_mountpoint)
+ GRML_FLAVOURS.add(flavour)
finally:
if remove_device_mountpoint:
remove_mountpoint(device_mountpoint)
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