diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-03-08 09:58:06 -0500 |
|---|---|---|
| committer | Daniel Watkins <daniel.watkins@canonical.com> | 2019-03-11 17:08:35 -0400 |
| commit | ba2a7627404d82a2f5728ceb66d62bdc82e1fe07 (patch) | |
| tree | 6f8092acb7396cb790a481771e4fb65614a5f412 | |
| parent | efd8e7de675c7b4fc1c795b56e7b6edc6ba5ca25 (diff) | |
| download | cloud-init-git-ba2a7627404d82a2f5728ceb66d62bdc82e1fe07.tar.gz | |
d/postinst: remove now-incorrect apt pipelining configurationubuntu/18.5-45-g3554ffe8-0ubuntu1_18.04.1
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/cloud-init.postinst | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 185f8e78..e12179d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ cloud-init (18.5-45-g3554ffe8-0ubuntu1~18.04.1) bionic; urgency=medium * Change Priority from extra to optional * Override lintian warnings about WantedBy=cloud-init.target * Change Maintainer to Ubuntu Developers + * d/postinst: remove now-incorrect apt pipelining configuration -- Daniel Watkins <oddbloke@ubuntu.com> Mon, 11 Mar 2019 17:07:54 -0400 diff --git a/debian/cloud-init.postinst b/debian/cloud-init.postinst index f88d1c52..93d58e2e 100644 --- a/debian/cloud-init.postinst +++ b/debian/cloud-init.postinst @@ -297,20 +297,6 @@ datasource_list: [ $values ] EOF fi - # we want to affect apt_pipelining on install, not wait for - # cloud-init to run it on next boot. - pipeline_f="/etc/apt/apt.conf.d/90cloud-init-pipelining" - if [ -f /var/lib/cloud/instance/obj.pkl ]; then - cloud-init single --name apt-pipelining --frequency once >/dev/null 2>&1 || - echo "Warning: failed to setup apt-pipelining" 1>&2 - elif [ ! -f "$pipeline_f" ]; then - # there was no cloud available, so populate it ourselves. - cat > "$pipeline_f" <<EOF -//Written by cloud-init per 'apt_pipelining' -Acquire::http::Pipeline-Depth "0"; -EOF - fi - # if there are maas settings pre-seeded apply them handle_preseed_maas |