[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH initramfs-tools 4/4] scripts/functions: Stop resolving symlinks in resolve_device



Now that we use blkid directly, there is no need to resolve /dev/disk
symlinks.  We shouldn't resolve any other symlinks we're given either,
as this causes /proc/mounts to be inconsistent with /etc/fstab.

Closes: #791754
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/functions | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/functions b/scripts/functions
index 5916a94..499a430 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -307,8 +307,7 @@ resolve_device() {
 		fi
 		;;
 	esac
-	[ -e "$DEV" ] || return 1
-	readlink -f "$DEV"
+	[ -e "$DEV" ] && echo "$DEV"
 }
 
 # Check a file system.

Attachment: signature.asc
Description: Digital signature


Reply to: