From: Michael Prokop <mika@grml.org>
Date: Thu, 5 Jan 2012 13:52:55 +0000 (+0100)
Subject: Make sure we don't fail in device check when using /dev/disk-by-label/*
X-Git-Tag: v0.11.4~1
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=7c0195d59551ba5df7010eb696d0b4612d7811f3;hp=35feaad92af2e631460f44204f2a9b88c40d7468

Make sure we don't fail in device check when using /dev/disk-by-label/*

Quoting Bernhard on IRC:

| i usually use ~by-label/<mysticksname> as device names, so that
| I don't mix up any /dev/sd?? devices and I just realized that
| when i do this (of course I can use ~bylabel/<mysticksname>(:A)
| in the future) grml2usb does neither recognize that my device is
| already mounted (not much of a problem with current kernel
| apparently), but the "superdisk" check which just looks for a
| digit in the last char of the device string, fails as well

Thanks: Bernhard Tittelbach for bugreport and patch
---

diff --git a/grml2usb b/grml2usb
index b3e25df..13baf0e 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1635,7 +1635,7 @@ def main():
     check_programs()
 
     # specified arguments
-    device = args[len(args) - 1]
+    device = os.path.realpath(args[len(args) - 1])
     isos = args[0:len(args) - 1]
 
     if not os.path.isdir(device):