summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-09-09 15:55:30 -0400
committerScott Moser <smoser@ubuntu.com>2010-09-09 15:55:30 -0400
commit06b6b316f591f01ac59304620afa200d0d62cac9 (patch)
tree71a4c7e66e1de1da6bfd598a1896a7ff313d646d /cloudinit
parente4b3cddd96380a203f902ccd3f425cadc0c37772 (diff)
downloadvyos-cloud-init-06b6b316f591f01ac59304620afa200d0d62cac9.tar.gz
vyos-cloud-init-06b6b316f591f01ac59304620afa200d0d62cac9.zip
change default for ephemeral0 device to use 'nobootwait'
This means that if you booted an ebs instance with a ephemeral0 device and then stopped it and modified its type to be one that did *not* have an ephemeral0 device, you'd still have the entry, but it wouldn't block boot. LP: #634102
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/CloudConfig/cc_mounts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/cc_mounts.py b/cloudinit/CloudConfig/cc_mounts.py
index 97ea1138..c8746d33 100644
--- a/cloudinit/CloudConfig/cc_mounts.py
+++ b/cloudinit/CloudConfig/cc_mounts.py
@@ -33,7 +33,7 @@ def is_mdname(name):
def handle(name,cfg,cloud,log,args):
# these are our default set of mounts
- defmnts = [ [ "ephemeral0", "/mnt", "auto", "defaults", "0", "2" ],
+ defmnts = [ [ "ephemeral0", "/mnt", "auto", "defaults,nobootwait", "0", "2" ],
[ "swap", "none", "swap", "sw", "0", "0" ] ]
# fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno