summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorVlastimil Holer <vlastimil.holer@gmail.com>2013-01-03 13:07:07 +0100
committerVlastimil Holer <vlastimil.holer@gmail.com>2013-01-03 13:07:07 +0100
commite53ab8f17d2aa8d6826581eee20202812b0620e9 (patch)
treeee75576fca69e20a9332624bd1a38accdc11e3fa /cloudinit
parent3569e71a1579b97f4e33fb46ab3fcef08a4ddad4 (diff)
downloadvyos-cloud-init-e53ab8f17d2aa8d6826581eee20202812b0620e9.tar.gz
vyos-cloud-init-e53ab8f17d2aa8d6826581eee20202812b0620e9.zip
Support for sr[0-9]+ short device names.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_mounts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
index cb772c86..9010d97f 100644
--- a/cloudinit/config/cc_mounts.py
+++ b/cloudinit/config/cc_mounts.py
@@ -24,8 +24,8 @@ import re
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"