Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #51843

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

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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.

Back to linux.debian.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH initramfs-tools 0/4] Fix resolution of device IDs Ben Hutchings <ben@decadent.org.uk> - 2015-12-22 22:50 +0100
  [PATCH initramfs-tools 2/4] scripts/local: Name parameters to  local_device_setup Ben Hutchings <ben@decadent.org.uk> - 2015-12-22 22:50 +0100
  [PATCH initramfs-tools 4/4] scripts/functions: Stop resolving  symlinks in resolve_device Ben Hutchings <ben@decadent.org.uk> - 2015-12-22 22:50 +0100
  [PATCH initramfs-tools 1/4] scripts/local: Remove residual support  for separate /etc filesystem Ben Hutchings <ben@decadent.org.uk> - 2015-12-22 22:50 +0100
  [PATCH initramfs-tools 3/4] Defer resolving block device IDs to  local_device_setup Ben Hutchings <ben@decadent.org.uk> - 2015-12-22 22:50 +0100
  Re: [PATCH initramfs-tools 0/4] Fix resolution of device IDs Ben Hutchings <ben@decadent.org.uk> - 2015-12-22 22:50 +0100

csiph-web