cloud-utils

Merge lp:~kevinoid/cloud-utils/fix-growpart-disk-symlink into lp:cloud-utils

  1. fix-growpart-disk-symlink
  2. Merge into trunk
Proposed by Kevin Locke
Status: Merged
Merged at revision: 338
Proposed branch: lp:~kevinoid/cloud-utils/fix-growpart-disk-symlink
Merge into: lp:cloud-utils
Diff against target: 19 lines (+9/-0)
1 file modified
bin/growpart (+9/-0)
To merge this branch: bzr merge lp:~kevinoid/cloud-utils/fix-growpart-disk-symlink
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+336390@code.launchpad.net

Description of the change

This merge request proposes a fix for https://launchpad.net/bugs/1744406 by resolving a symlink disk path argument before it is used.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

Sorry for very slow reply.
Your fix does look fine.

thanks.

Revision history for this message
Kevin Locke (kevinoid) wrote :

No worries. Thanks for reviewing it!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/growpart'
2--- bin/growpart 2016-09-01 17:46:40 +0000
3+++ bin/growpart 2018-01-19 23:02:59 +0000
4@@ -767,6 +767,15 @@
5
6 [ -e "${DISK}" ] || fail "${DISK}: does not exist"
7
8+# If $DISK is a symlink, resolve it.
9+# This avoids problems due to varying partition device name formats
10+# (e.g. "1" for /dev/sda vs "-part1" for /dev/disk/by-id/name)
11+if [ -L "${DISK}" ] ; then
12+ real_disk=$(readlink -f "${DISK}") || fail "unable to resolve ${DISK}"
13+ debug 1 "${DISK} resolved to ${real_disk}"
14+ DISK=${real_disk}
15+fi
16+
17 [ "${PART#*[!0-9]}" = "${PART}" ] || fail "partition-number must be a number"
18
19 verify_ptupdate "$pt_update" || fail

Subscribers

People subscribed via source and target branches