Merge from core24 #73
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…very If dhcpcd is installed in a cloud image, cloud-init may attempt early datasource discovery using dhcpcd in order to get information about active instance metadata service IP addresses and routes. The dhcpcd client writes out leases which cloud-init parses under /var/lib/dhcpcd. Add this support so cloud-init can detect network-bound datasources such as Azure, Ec2 and GCE.
* tools/generate-changelog.py: add a permalink in the changelog from which the current build is sourced * many: generate permalink inside the python script, add some indentation * tools: remove .git suffix
…kage changes (canonical#246) * Makefile,snapcraft: generate changelog between commits in local snap repo as well * tools/generate-changelog.py: add better docs, more error handling and use --pretty=short for log output * tools/generate-changelog.py: remove additional newlines
* snap-patch: add patch to enable fips build * snapcraft: enable fips build when the origin remote contains fips * snapcraft: remove local patch * snapcraft: remove added newline * many: remove the patch approach, instead rely on environmental variable to do switching * github: update actions * hooks: use apt config file instead for fips PPA access instead of patch * many: move the fips.conf.example to root of project, copy from makefile and remember to cleanup FIPS files * Makefile,snapcraft: switch to rm -f and switch import of env file * Makefile: merge two ifdefs, ise lsb_release to get codename * hooks: fix typo
…onical#250) * Makefile: read os-release instead * Makefile: set CODENAME as a variable outside of target * Makefile: expand once and use shell ident
|
Hey! jhenstridge has not signed the Canonical CLA which is required to get this contribution merged on this project.
Please head over to https://ubuntu.com/legal/contributors to read more about it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge changes from upstream core24 snap.