X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=3ca38a5c0d9dec415800965a9296ec49624ce4a9;hp=16b53cd85c4da0b6e3b42e0b89a109574ad531d4;hb=0deeae3373cffe3a007b8bf6c0b642830601c9b7;hpb=3f80e5a0eb34b5b73961de842a0e7fbf0a510011

diff --git a/grml2usb b/grml2usb
index 16b53cd..3ca38a5 100755
--- a/grml2usb
+++ b/grml2usb
@@ -60,10 +60,10 @@ def grub_option(option, opt, value, opt_parser):
     setattr(opt_parser.values, 'syslinux', False)
 
 # cmdline parsing
-USAGE = "Usage: %prog [options] <[ISO[s] | /live/image]> </dev/sdX#>\n\
+USAGE = "Usage: %prog [options] <[ISO[s] | /lib/live/mount/medium]> </dev/sdX#>\n\
 \n\
-%prog installs grml ISO[s] to an USB device to be able to boot from it.\n\
-Make sure you have at least one grml ISO or a running grml system (/live/image),\n\
+%prog installs Grml ISO[s] to an USB device to be able to boot from it.\n\
+Make sure you have at least one Grml ISO or a running Grml system (/lib/live/mount/medium),\n\
 grub or syslinux and root access.\n\
 \n\
 Run %prog --help for usage hints, further information via: man grml2usb"
@@ -312,7 +312,12 @@ def check_uid_root():
 
 
 def check_boot_flag(device):
-    with open(device, 'r') as image:
+    if device[-1:].isdigit():
+        boot_dev = re.match(r'(.*?)\d*$', device).group(1)
+    else:
+        boot_dev = device
+
+    with open(boot_dev, 'r') as image:
         data = image.read(512)
         bootcode = data[440:]
         if bootcode[6] == '\x80':
@@ -320,7 +325,7 @@ def check_boot_flag(device):
         else:
             logging.debug("bootflag is NOT enabled")
             raise VerifyException("Device %s does not have the bootflag set. "
-                "Please enable it to be able to boot." % device)
+                "Please enable it to be able to boot." % boot_dev)
 
 
 def mkfs_fat16(device):
@@ -1126,7 +1131,7 @@ def identify_grml_flavour(mountpath):
     version_files = search_file('grml-version', mountpath, lst_return=True)
 
     if not version_files:
-        if mountpath.startswith("/live/image"):
+        if mountpath.startswith("/lib/live/mount/medium"):
             logging.critical("Error: could not find grml-version file.")
             logging.critical("Looks like your system is running from RAM but required files are not available.")
             logging.critical("Please either boot without toram=... or use boot option toram instead of toram=...")
@@ -1480,7 +1485,7 @@ def install(image, device):
 def install_grml(mountpoint, device):
     """Main logic for copying files of the currently running grml system.
 
-    @mountpoin: directory where currently running live system resides (usually /live/image)
+    @mountpoint: directory where currently running live system resides (usually /lib/live/mount/medium)
     @device: partition where the specified ISO should be installed to"""
 
     device_mountpoint = device