Re: [Cloud-init-dev] [Merge] ~raharper/cloud-init:fix/cloud-init-per-bad-sub into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:44037f7920216a3fc44192e057ef36b916ea2902 https://jenkins.ubuntu.com/server/job/cloud-init-ci/630/ Executed test runs: SUCCESS: Checkout SUCCESS: Unit & Style Tests SUCCESS: Ubuntu LTS: Build SUCCESS: Ubuntu LTS: Integration IN_PROGRESS: Declarative: Post Actions Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/630/rebuild -- https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/364190 Your team cloud-init commiters is requested to review the proposed merge of ~raharper/cloud-init:fix/cloud-init-per-bad-sub into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~raharper/cloud-init:fix/cloud-init-per-bad-sub into cloud-init:master
Ryan Harper has proposed merging
~raharper/cloud-init:fix/cloud-init-per-bad-sub into cloud-init:master.
Commit message:
cloud-init-per: POSIX sh does not support string subst, use sed
cloud-init-per is run via /bin/sh which requires POSIX shell
compliance and does not implement string substitution like
bash. Replace these calls with use of sed.
LP: #1819222
Requested reviews:
cloud-init commiters (cloud-init-dev)
Related bugs:
Bug #1819222 in cloud-init: "cloud-init-per no longer works due to bashisms"
https://bugs.launchpad.net/cloud-init/+bug/1819222
For more details, see:
https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/364190
--
Your team cloud-init commiters is requested to review the proposed merge of
~raharper/cloud-init:fix/cloud-init-per-bad-sub into cloud-init:master.
diff --git a/tools/cloud-init-per b/tools/cloud-init-per
index eae3e93..fcd1ea7 100755
--- a/tools/cloud-init-per
+++ b/tools/cloud-init-per
@@ -38,7 +38,7 @@ fi
[ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; }
[ $# -ge 3 ] || { Usage 1>&2; exit 1; }
freq=$1
-name=${2/-/_}
+name=$(echo $2 | sed 's/-/_/g')
shift 2;
[ "${name#*/}" = "${name}" ] || fail "name cannot contain a /"
@@ -56,7 +56,7 @@ esac
# Rename legacy sem files with dashes in their names. Do not overwrite existing
# sem files to prevent clobbering those which may have been created from calls
# outside of cloud-init.
-sem_legacy="${sem/_/-}"
+sem_legacy=$(echo $sem | sed 's/_/-/g')
[ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"
[ "$freq" != "always" -a -e "$sem" ] && exit 0
___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~daniel-thewatkins/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel
I think the post-inst should attempt to remove the existing file cloud-init wrote on upgrade. Thoughts? -- https://code.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/364162 Your team cloud-init commiters is requested to review the proposed merge of ~daniel-thewatkins/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~daniel-thewatkins/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel
Dan Watkins has proposed merging ~daniel-thewatkins/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel. Requested reviews: cloud-init commiters (cloud-init-dev) For more details, see: https://code.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/364162 -- Your team cloud-init commiters is requested to review the proposed merge of ~daniel-thewatkins/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel. diff --git a/debian/changelog b/debian/changelog index 61f09d7..c17e38b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cloud-init (18.5-44-g7c07af28-0ubuntu2) disco; urgency=medium + + * d/postinst: remove now-incorrect apt pipelining configuration + + -- Daniel Watkins Fri, 08 Mar 2019 09:56:42 -0500 + cloud-init (18.5-44-g7c07af28-0ubuntu1) disco; urgency=medium * New upstream snapshot. diff --git a/debian/cloud-init.postinst b/debian/cloud-init.postinst index f88d1c5..93d58e2 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" <___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
