Support /media as mountpath (related to issue1127)

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index 7d9f92e..7b17c72 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -1121,7 +1121,7 @@ def handle_grub_config(grml_flavour, device, target):
         for regex in options.removeoption:
             remove_regexes.append(re.compile(regex))
 
-    for filename in glob.glob(grub_target + '*.cfg'):
+    for filename in glob.glob(grub_target + grml_flavour + '*.cfg'):
         for line in fileinput.input(filename, inplace=1):
             line = line.rstrip("\r\n")
             if option_re.search(line):
@@ -1536,7 +1536,8 @@ def handle_compat_warning(device):
     @device: device that should be checked"""
 
     # make sure we can replace old grml2usb script and warn user when using old way of life:
-    if device.startswith("/mnt/external") or device.startswith("/mnt/usb") and not options.force:
+    if device.startswith("/media/external") or device.startswith("/media/usb") or \
+        device.startswith("/mnt/external") or device.startswith("/mnt/usb") and not options.force:
         print "Warning: the semantics of grml2usb has changed."
         print "Instead of using grml2usb /path/to/iso %s you might" % device
         print "want to use grml2usb /path/to/iso /dev/... instead."