diff options
| author | Scott Moser <smoser@ubuntu.com> | 2010-07-08 20:52:54 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2010-07-08 20:52:54 -0400 |
| commit | b5c3659c29db2177665ff6c1c10587bc1d8eba1f (patch) | |
| tree | 92a4f6af85468321c9ef6a7d62e033f4d91dc3f3 | |
| parent | d96186bc66b86639e9f9257aa288256e11e44ad5 (diff) | |
| download | vyos-cloud-init-b5c3659c29db2177665ff6c1c10587bc1d8eba1f.tar.gz vyos-cloud-init-b5c3659c29db2177665ff6c1c10587bc1d8eba1f.zip | |
add 'nobootwait' to the default options for fstab entries
It just seems like for cloud instances, getting /etc/fstab written
incorrectly with the result of non-booting system is worth avoiding.
| -rw-r--r-- | cloudinit/CloudConfig/cc_mounts.py | 2 | ||||
| -rw-r--r-- | doc/examples/cloud-config.txt | 2 |
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) |