diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-20 10:06:55 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-20 10:06:55 -0500 |
| commit | d00b7dba8767618ae360f56bf64b7ab7a8c49d2e (patch) | |
| tree | 349799f76c39669a03a6acbd48502970c0abb994 /cloudinit/config/cc_apt_configure.py | |
| parent | fa3009b64949fef3744ddb940f01477dfa2d25e5 (diff) | |
| parent | 7fb6f78177b5ece10ca7c54ba3958010a9987f06 (diff) | |
| download | vyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.tar.gz vyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.zip | |
merge from 0.7.9 at 0.7.9
Diffstat (limited to 'cloudinit/config/cc_apt_configure.py')
| -rw-r--r-- | cloudinit/config/cc_apt_configure.py | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index 6145fcd2..7f09c919 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -1,22 +1,10 @@ -# vi: ts=4 expandtab -# -# Copyright (C) 2009-2010 Canonical Ltd. -# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. -# -# Author: Scott Moser <scott.moser@canonical.com> -# Author: Juerg Haefliger <juerg.haefliger@hp.com> +# Copyright (C) 2009-2010 Canonical Ltd. +# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3, as -# published by the Free Software Foundation. +# Author: Scott Moser <scott.moser@canonical.com> +# Author: Juerg Haefliger <juerg.haefliger@hp.com> # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# This file is part of cloud-init. See LICENSE file for license information. """ Apt Configure @@ -199,6 +187,8 @@ The ``source`` key supports variable replacements for the following strings: deb-src $MIRROR $RELEASE main restricted deb $PRIMARY $RELEASE universe restricted deb $SECURITY $RELEASE-security multiverse + debconf_selections: + set1: the-package the-package/some-flag boolean true conf: | APT { Get { @@ -216,9 +206,9 @@ The ``source`` key supports variable replacements for the following strings: keyserver: "keyserverurl" source: "deb http://<url>/ xenial main" source2: - source "ppa:<ppa-name>" + source: "ppa:<ppa-name>" source3: - source "deb $MIRROR $RELEASE multiverse" + source: "deb $MIRROR $RELEASE multiverse" key: | ------BEGIN PGP PUBLIC KEY BLOCK------- <key data> @@ -928,4 +918,4 @@ CONFIG_CLEANERS = { 'cloud-init': clean_cloud_init, } -# vi: ts=4 expandtab syntax=python +# vi: ts=4 expandtab |