cloud-init

Merge lp:~vlastimil-holer/cloud-init/sr0 into lp:~cloud-init-dev/cloud-init/trunk

  1. sr0
  2. Merge into trunk
Proposed by Vlastimil Holer
Status: Merged
Merged at revision: 758
Proposed branch: lp:~vlastimil-holer/cloud-init/sr0
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
cloudinit/config/cc_mounts.py (+2/-2)
To merge this branch: bzr merge lp:~vlastimil-holer/cloud-init/sr0
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+141739@code.launchpad.net

Description of the change

Support for sr[0-9]+ short device names.

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

Vlastimil,
  Thanks, the change looks fine.
  Please fill out the contributors agreement at http://www.canonical.com/contributors .

Revision history for this message
Vlastimil Holer (vlastimil-holer) wrote :

> Vlastimil,
> Thanks, the change looks fine.
> Please fill out the contributors agreement at
> http://www.canonical.com/contributors .

OK, I did right now. Thanks.

Revision history for this message
Scott Moser (smoser) wrote :

On Mon, 7 Jan 2013, Vlastimil Holer wrote:

> > Vlastimil,
> > Thanks, the change looks fine.
> > Please fill out the contributors agreement at
> > http://www.canonical.com/contributors .
>
> OK, I did right now. Thanks.

Merged. Thanks for your contribution.
Scott
> --
> https://code.launchpad.net/~vlastimil-holer/cloud-init/sr0/+merge/141739
> You are subscribed to branch lp:cloud-init.
>
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/config/cc_mounts.py'
2--- cloudinit/config/cc_mounts.py 2012-10-28 02:25:48 +0000
3+++ cloudinit/config/cc_mounts.py 2013-01-03 12:11:22 +0000
4@@ -24,8 +24,8 @@
5
6 from cloudinit import util
7
8-# Shortname matches 'sda', 'sda1', 'xvda', 'hda', 'sdb', xvdb, vda, vdd1
9-SHORTNAME_FILTER = r"^[x]{0,1}[shv]d[a-z][0-9]*$"
10+# Shortname matches 'sda', 'sda1', 'xvda', 'hda', 'sdb', xvdb, vda, vdd1, sr0
11+SHORTNAME_FILTER = r"^([x]{0,1}[shv]d[a-z][0-9]*|sr[0-9]+)$"
12 SHORTNAME = re.compile(SHORTNAME_FILTER)
13 WS = re.compile("[%s]+" % (whitespace))
14 FSTAB_PATH = "/etc/fstab"