diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | cloudinit/config/cc_mounts.py | 6 | ||||
| -rw-r--r-- | templates/sources.list.ubuntu.tmpl | 38 |
3 files changed, 27 insertions, 21 deletions
@@ -65,6 +65,10 @@ - ubuntu fan: support for config and installing of ubuntu fan (LP: #1504604) - Azure: support extracting SSH key values from ovf-env.xml (LP: #1506244) - AltCloud: fix call to udevadm settle (LP: #1507526) + - Ubuntu templates: modify sources.list template to provide same sources + as install from server or desktop ISO. (LP: #1177432) + - cc_mounts: use 'nofail' if system uses systemd. (LP: #1514485) + - Azure: get instance id from dmi instead of SharedConfig (LP: #1506187) 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 47b63dfc..11089d8d 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -263,7 +263,11 @@ def handle_swapcfg(swapcfg): def handle(_name, cfg, cloud, log, _args): # fs_spec, fs_file, fs_vfstype, fs_mntops, fs-freq, fs_passno - defvals = [None, None, "auto", "defaults,nobootwait", "0", "2"] + def_mnt_opts = "defaults,nobootwait" + if cloud.distro.uses_systemd(): + def_mnt_opts = "defaults,nofail" + + defvals = [None, None, "auto", def_mnt_opts, "0", "2"] defvals = cfg.get("mount_default_fields", defvals) # these are our default set of mounts diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl index 4b1b019a..d8799726 100644 --- a/templates/sources.list.ubuntu.tmpl +++ b/templates/sources.list.ubuntu.tmpl @@ -9,13 +9,13 @@ # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. -deb {{mirror}} {{codename}} main -deb-src {{mirror}} {{codename}} main +deb {{mirror}} {{codename}} main restricted +deb-src {{mirror}} {{codename}} main restricted ## Major bug fix updates produced after the final release of the ## distribution. -deb {{mirror}} {{codename}}-updates main -deb-src {{mirror}} {{codename}}-updates main +deb {{mirror}} {{codename}}-updates main restricted +deb-src {{mirror}} {{codename}}-updates main restricted ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team. Also, please note that software in universe WILL NOT receive any @@ -26,24 +26,29 @@ deb {{mirror}} {{codename}}-updates universe deb-src {{mirror}} {{codename}}-updates universe ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to +## team, and may not be under a free licence. Please satisfy yourself as to ## your rights to use the software. Also, please note that software in ## multiverse WILL NOT receive any review or updates from the Ubuntu ## security team. -# deb {{mirror}} {{codename}} multiverse -# deb-src {{mirror}} {{codename}} multiverse -# deb {{mirror}} {{codename}}-updates multiverse -# deb-src {{mirror}} {{codename}}-updates multiverse +deb {{mirror}} {{codename}} multiverse +deb-src {{mirror}} {{codename}} multiverse +deb {{mirror}} {{codename}}-updates multiverse +deb-src {{mirror}} {{codename}}-updates multiverse -## Uncomment the following two lines to add software from the 'backports' -## repository. ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -# deb {{mirror}} {{codename}}-backports main restricted universe multiverse -# deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse +deb {{mirror}} {{codename}}-backports main restricted universe multiverse +deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse + +deb {{security}} {{codename}}-security main restricted +deb-src {{security}} {{codename}}-security main restricted +deb {{security}} {{codename}}-security universe +deb-src {{security}} {{codename}}-security universe +deb {{security}} {{codename}}-security multiverse +deb-src {{security}} {{codename}}-security multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. @@ -51,10 +56,3 @@ deb-src {{mirror}} {{codename}}-updates universe ## respective vendors as a service to Ubuntu users. # deb http://archive.canonical.com/ubuntu {{codename}} partner # deb-src http://archive.canonical.com/ubuntu {{codename}} partner - -deb {{security}} {{codename}}-security main -deb-src {{security}} {{codename}}-security main -deb {{security}} {{codename}}-security universe -deb-src {{security}} {{codename}}-security universe -# deb {{security}} {{codename}}-security multiverse -# deb-src {{security}} {{codename}}-security multiverse |