summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2ec387d)
In "unmount" it tries to make sure the path to umount is actually mounted
by comparing the mounted path against the output of "/proc/mounts". Because
paths reported by "/proc/mounts" are normalized, this will fail if there
are any symlinks involved (leaving all mounts and an unbootable usb stick).
* Fix dashes of options in manpage (thanks for the bugreport,
Thorsten Glaser).
* Display program version during execution.
* Fix dashes of options in manpage (thanks for the bugreport,
Thorsten Glaser).
* Display program version during execution.
+ * Apply fix by Peter Daum <gator@cs.tu-berlin.de>, making sure
+ to use the normalized path for unmounting. Thanks!
- -- Michael Prokop <mika@grml.org> Fri, 10 Apr 2009 01:08:01 +0200
+ -- Michael Prokop <mika@grml.org> Tue, 21 Apr 2009 10:31:18 +0200
grml2usb (0.9.4) unstable; urgency=low
grml2usb (0.9.4) unstable; urgency=low
# make sure we unmount only already mounted targets
target_unmount = False
mounts = open('/proc/mounts').readlines()
# make sure we unmount only already mounted targets
target_unmount = False
mounts = open('/proc/mounts').readlines()
- mountstring = re.compile(".*%s.*" % re.escape(target))
+ mountstring = re.compile(".*%s.*" % re.escape(os.path.realpath(target)))
for line in mounts:
if re.match(mountstring, line):
target_unmount = True
for line in mounts:
if re.match(mountstring, line):
target_unmount = True