Ubuntu
initramfs-tools package

Merge ~sm4rk0/ubuntu/+source/initramfs-tools:ubuntu into ~ubuntu-kernel/ubuntu/+source/initramfs-tools:ubuntu

  1. Git
  2. lp:~sm4rk0/ubuntu/+source/initramfs-tools
  3. ubuntu
  4. Merge into ubuntu
Proposed by Marko Stanković
Status: Merged
Merged at revision: 42c9aadebd3fc4a5745968870d5c4004ddda47f5
Proposed branch: ~sm4rk0/ubuntu/+source/initramfs-tools:ubuntu
Merge into: ~ubuntu-kernel/ubuntu/+source/initramfs-tools:ubuntu
Diff against target: 13 lines (+1/-1)
1 file modified
hook-functions (+1/-1)
Reviewer Review Type Date Requested Status
Andy Whitcroft Approve
Review via email: mp+284807@code.launchpad.net

Commit message

hook-functions: fix NVME typo LP: #1539826

Description of the change

hook-functions: fix NVME typo LP: #1539826

To post a comment you must log in.
Revision history for this message
Andy Whitcroft (apw) wrote :

Looks good to me. Will manually merge and upload as I also have a v0.122 upload pending on the packaging branch. Thanks for your contribution.

review: Approve
Revision history for this message
Marko Stanković (sm4rk0) wrote :

I'm glad I've helped. May I delete my repository now?

There's this message when I click the "Delete this repository" link:
The following items must be deleted:

    [Merge] ~sm4rk0/ubuntu/+source/initramfs-tools:ubuntu into ~ubuntu-kernel/ubuntu/+source/initramfs-tools:ubuntu (This repository is the source repository of this merge proposal.)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hook-functions b/hook-functions
2index a22cb4e..a011160 100644
3--- a/hook-functions
4+++ b/hook-functions
5@@ -471,7 +471,7 @@ dep_add_modules_mount()
6 block=${block%%[0-9]*}
7 block='i2o!'$block
8 # nvme device
9- elif [ "${root#/dev/nvme}" != "${dev_node}" ]; then
10+ elif [ "${dev_node#/dev/nvme}" != "${dev_node}" ]; then
11 block=${dev_node#/dev/}
12 block="${block%%p[0-9]*}"
13 # classical block device

Subscribers

People subscribed via source and target branches