cloud-init-dev team mailing list archive

[Vlastimil Holer <vlastimil.holer@xxxxxxxxx>]

Vlastimil Holer has proposed merging lp:~vlastimil-holer/cloud-init/sr0 into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~vlastimil-holer/cloud-init/sr0/+merge/141739

Support for sr[0-9]+ short device names.
-- 
https://code.launchpad.net/~vlastimil-holer/cloud-init/sr0/+merge/141739
Your team cloud init development team is requested to review the proposed merge of lp:~vlastimil-holer/cloud-init/sr0 into lp:cloud-init.

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