Merge ~dbungert/curtin:fix-kname-link into curtin:master

Proposed by Dan Bungert
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: d6956f35be8ec73ff8df1b0e2decfc491b7c41d5
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~dbungert/curtin:fix-kname-link
Merge into: curtin:master
Diff against target: 13 lines (+1/-1)
1 file modified
curtin/block/__init__.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Michael Hudson-Doyle Approve
Review via email: mp+460269@code.launchpad.net

Commit message

block: fix kname kernel ref

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

I wonder what happened to the previously referenced commit??

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/curtin/block/__init__.py b/curtin/block/__init__.py
2index 38a105c..87990d6 100644
3--- a/curtin/block/__init__.py
4+++ b/curtin/block/__init__.py
5@@ -134,7 +134,7 @@ def partition_kname(disk_kname, partition_number):
6 partition_number)))
7
8 # follow the same rules the kernel check_partition() does
9- # https://github.com/torvalds/linux/blob/0fac198/block/partitions/core.c#L141
10+ # https://github.com/torvalds/linux/blob/0473719/block/partitions/core.c#L330
11 if disk_kname[-1:].isdigit():
12 partition_number = "p%s" % partition_number
13 return "%s%s" % (disk_kname, partition_number)

Subscribers

People subscribed via source and target branches