@device: partition that should be formated"""
# syslinux -d boot/isolinux /dev/sdb1
+ if options.dryrun:
+ logging.info("Would execute mkfs.vfat -F 16 %s now.", device)
+ return 0
+
logging.info("Formating partition with fat16 filesystem")
logging.debug("mkfs.vfat -F 16 %s" % device)
proc = subprocess.Popen(["mkfs.vfat", "-F", "16", device])
if x.startswith(source):
raise CriticalException("Error executing mount: %s already mounted - please unmount before invoking grml2usb" % source)
+ if os.path.isdir(source):
+ logging.debug("Source %s is not a device, not mounting therefor." % source)
+ return 0
+
logging.debug("mount %s %s %s" % (mount_options, source, target))
proc = subprocess.Popen(["mount"] + list(mount_options) + [source, target])
proc.wait()
if udev_info.returncode == 2:
raise CriticalException("Failed to read device %s"
- " (wrong UID/permissions or device not present?)" % partition)
+ " (wrong UID/permissions or device/directory not present?)" % partition)
if options.syslinux and filesystem != "vfat":
raise CriticalException("Partition %s does not contain a FAT16 filesystem. (Use --fat16 or run mkfs.vfat %s)" % (partition, partition))
# grub all-in-one image
allinoneimg = search_file('allinone.img', iso_mount)
if allinoneimg is None:
- logging.warn("Warning: allinone.img not found - can not install it")
+ logging.warn("Warning: allinone.img not found - can not install it...")
+ logging.warn(" -> that's fine if you don't need it - or are you using grml-small?")
else:
logging.debug("cp %s %s" % (allinoneimg, addons + '/allinone.img'))
proc = subprocess.Popen(["cp", allinoneimg, addons + 'allinone.img'])
# bsd imag
bsdimg = search_file('bsd4grml', iso_mount)
if bsdimg is None:
- logging.warn("Warning: bsd4grml not found - can not install it")
+ logging.warn("Warning: bsd4grml not found - can not install it...")
+ logging.warn(" -> that's fine if you don't need it - or are you using grml-small?")
else:
logging.debug("cp -a %s %s" % (bsdimg, addons + '/'))
proc = subprocess.Popen(["cp", "-a", bsdimg, addons + '/'])
# freedos image
balderimg = search_file('balder10.imz', iso_mount)
if balderimg is None:
- logging.warn("Warning: balder10.imz not found - can not install it")
+ logging.warn("Warning: balder10.imz not found - can not install it...")
+ logging.warn(" -> that's fine if you don't need it - or are you using grml-small?")
else:
logging.debug("cp %s %s" % (balderimg, addons + '/balder10.imz'))
proc = subprocess.Popen(["cp", balderimg, addons + 'balder10.imz'])
# memdisk image
memdiskimg = search_file('memdisk', iso_mount)
if memdiskimg is None:
- logging.warn("Warning: memdisk not found - can not install it")
+ logging.warn("Warning: memdisk not found - can not install it...")
+ logging.warn(" -> that's fine if you don't need it - or are you using grml-small?")
else:
logging.debug("cp %s %s" % (memdiskimg, addons + '/memdisk'))
proc = subprocess.Popen(["cp", memdiskimg, addons + 'memdisk'])
# memtest86+ image
memtestimg = search_file('memtest', iso_mount)
if memtestimg is None:
- logging.warn("Warning: memtest not found - can not install it")
+ logging.warn("Warning: memtest not found - can not install it...")
+ logging.warn(" -> that's fine if you don't need it - or are you using grml-small?")
else:
logging.debug("cp %s %s" % (memtestimg, addons + '/memtest'))
proc = subprocess.Popen(["cp", memtestimg, addons + 'memtest'])
@grml_flavour: name of grml flavour the configuration should be generated for
@iso_mount: path where a grml ISO is mounted on
+ @device: device/partition where bootloader should be installed to
@target: path where grml's main files should be copied to"""
# TODO => several improvements:
# * catch "install: .. No space left on device" & CO
if options.dryrun:
- logging.info("Would copy files to %s", iso_mount)
return 0
elif not options.bootloaderonly:
logging.info("Copying files. This might take a while....")
if not options.copyonly:
copy_bootloader_files(iso_mount, target)
- if not options.dryrun:
+ if not options.dryrun and not os.path.isdir(device):
handle_bootloader_config(grml_flavour, device, target)
# make sure we sync filesystems before returning
if device[-1:].isdigit():
install_grub1_partition = int(device[-1:]) - 1
install_grub2_partition = device[-1:]
+ else:
+ raise CriticalException("error validating partition schema (raw device?)")
# do NOT write "None" in kernel cmdline
if options.bootoptions is None:
if options.syslinux:
handle_syslinux_config(grml_flavour, target)
else:
- handle_grub_config(grml_flavour, device, target)
+ try:
+ handle_grub_config(grml_flavour, device, target)
+ except CriticalException, error:
+ logging.critical("Fatal: %s" % error)
+ sys.exit(1)
def handle_iso(iso, device):
@device: device where the MBR should be installed to"""
+ if options.dryrun:
+ logging.info("Would install MBR")
+ return 0
+
# make sure we have syslinux available
if not options.skipmbr:
- if not which("syslinux") and not options.copyonly and not options.dryrun:
+ if not which("syslinux") and not options.copyonly:
logging.critical('Sorry, syslinux not available. Exiting.')
logging.critical('Please install syslinux or consider using the --grub option.')
sys.exit(1)
logging.critical("Execution failed: %s", error)
sys.exit(1)
- if not check_for_usbdevice(device):
+ if not check_for_usbdevice(device) and not os.path.isdir(device):
print "Warning: the specified device %s does not look like a removable usb device." % device
f = raw_input("Do you really want to continue? y/N ")
if f == "y" or f == "Y":
# Install bootloader only if not using the --copy-only option
if options.copyonly:
logging.info("Not installing bootloader and its files as requested via option copyonly.")
+ elif os.path.isdir(device):
+ logging.info("Not installing bootloader as %s is a directory." % device)
else:
install_bootloader(device)
device = args[len(args) - 1]
isos = args[0:len(args) - 1]
- if device[-1:].isdigit():
- if int(device[-1:]) > 4:
- logging.critical("Fatal: installation on partition number >4 not supported. (BIOS won't support it.)")
- sys.exit(1)
- else:
- logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)")
- sys.exit(1)
+ if not os.path.isdir(device):
+ if device[-1:].isdigit():
+ if int(device[-1:]) > 4:
+ logging.critical("Fatal: installation on partition number >4 not supported. (BIOS won't support it.)")
+ sys.exit(1)
+ else:
+ if os.path.exists(device):
+ logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)")
+ sys.exit(1)
# provide upgrade path
handle_compat_warning(device)
handle_iso(iso, device)
# install mbr
- handle_mbr(device)
+ if not os.path.isdir(device):
+ handle_mbr(device)
handle_bootloader(device)
projects / grml2usb.git / blobdiff