summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cloudinit/CloudConfig/cc_mounts.py2
-rw-r--r--doc/examples/cloud-config.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/CloudConfig/cc_mounts.py b/cloudinit/CloudConfig/cc_mounts.py
index d48177d0..58cd9f4c 100644
--- a/cloudinit/CloudConfig/cc_mounts.py
+++ b/cloudinit/CloudConfig/cc_mounts.py
@@ -34,7 +34,7 @@ def handle(name,cfg,cloud,log,args):
[ "swap", "none", "swap", "sw", "0", "0" ] ]
# fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno
- defvals = [ None, None, "auto", "defaults", "0", "0" ]
+ defvals = [ None, None, "auto", "defaults,nobootwait", "0", "0" ]
cfgmnt = [ ]
if cfg.has_key("mounts"):
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
index e036feba..ed1ef47f 100644
--- a/doc/examples/cloud-config.txt
+++ b/doc/examples/cloud-config.txt
@@ -102,7 +102,7 @@ packages:
# written to /etc/fstab.
# - '/dev' can be ommitted for device names that begin with: xvd, sd, hd, vd
# - if an entry does not have all 6 fields, they will be filled in
-# from the following: [ None, None, "auto", "defaults", "0", "0" ]
+# from the following: [ None, None, "auto", "defaults,nobootwait", "0", "0" ]
#
# Note, that you should set 'nobootwait' (see man fstab) for volumes that may
# not be attached at instance boot (or reboot)