diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:27:47 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-07 16:27:47 -0500 |
| commit | 3199df6e1489da03d51ac8a2a4574c27fd325189 (patch) | |
| tree | 921700212c063d1b468a8ea2cac4f7df0f3a68d9 /cloudinit/config/cc_mounts.py | |
| parent | 21aec9e44c27b9bf1c96314f0449fd39793d1c73 (diff) | |
| parent | 8013c284e82349246b2274f5475c138323fd7c55 (diff) | |
| download | vyos-cloud-init-3199df6e1489da03d51ac8a2a4574c27fd325189.tar.gz vyos-cloud-init-3199df6e1489da03d51ac8a2a4574c27fd325189.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/config/cc_mounts.py')
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 6ebe563d..390ba711 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -25,8 +25,8 @@ import re from cloudinit import type_utils 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" |