x/cloud-init
Code Issues Proposed changes

Allow 'sr0' to be specified as a device for mounts

Browse Source 
Previously cloud-config to get a '/dev/sr0' entry written to /etc/fstab
would have had to have the full /dev/sr0.  This change allows cloud-config
to reference it without the '/dev/' prefix.  Like:
 | mounts:
 |  - [ sr0, /media/sr0 ]
This commit is contained in:
Vlastimil Holer 2013-01-07 12:27:06 -05:00 committed by Scott Moser
commit 58d14a48ed
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18,6 +18,8 @@
- fix redaction of password field in log (LP: #1096417)
- fix to cloud-config user setup. Previously, lock_passwd was broken and
all accounts would be locked unless 'system' was given (LP: #1096423).
- Allow 'sr0' (or sr[0-9]) to be specified without /dev/ as a source for
mounts. [Vlastimil Holer]
0.7.1:
- sysvinit: fix missing dependency in cloud-init job for RHEL 5.6
- config-drive: map hostname to local-hostname (LP: #1061964)

4
cloudinit/config/cc_mounts.py
View File

@ -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"