summaryrefslogtreecommitdiff
path: root/scripts/functions
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2014-09-30 13:18:10 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-09-30 13:19:03 +0100
commitf1d6fb372d64678cc9f6264e15a36a0123b7a69b (patch)
treeb1eb6f7825e4a5de29212f87a360e0e923775370 /scripts/functions
parent9274e84fd9a1c498c5a10c234b4c73000679ef2a (diff)
Revert "scripts/functions: untested without busybox"
Replacing $DEV with the output of readlink (no -f) doesn't work for relative symlinks or non-symlinks. udev generates relative symlinks in /dev/disk, so this just makes things worse. This reverts commit 9274e84fd9a1c498c5a10c234b4c73000679ef2a.
Diffstat (limited to 'scripts/functions')
-rw-r--r--scripts/functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/functions b/scripts/functions
index 9f5b9e0..11e8a10 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -496,7 +496,7 @@ resolve_device() {
;;
esac
# Only canonicalise if a valid file, in case $DEV isn't a filename
- [ -e "$DEV" ] && DEV=$(readlink "$DEV")
+ [ -e "$DEV" ] && DEV=$(readlink -f "$DEV")
echo "$DEV"
}