autopkgtest

Merge ~sergiodj/autopkgtest/+git/development:add-newline-etc-env into ~ubuntu-release/autopkgtest/+git/development:master

  1. Git
  2. lp:~sergiodj/autopkgtest/+git/development
  3. add-newline-etc-env
  4. Merge into master
Proposed by Sergio Durigan Junior
Status: Merged
Merged at revision: 864fa146155c293e3dbe5784abddf92c24ead7c3
Proposed branch: ~sergiodj/autopkgtest/+git/development:add-newline-etc-env
Merge into: ~ubuntu-release/autopkgtest/+git/development:master
Diff against target: 12 lines (+1/-1)
1 file modified
ssh-setup/nova (+1/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+412771@code.launchpad.net

Description of the change

PAM 1.4.x introduce a (silent) change in behaviour which makes it fail to parse /etc/environment when the file doesn't end with a newline. Because we use "printf" to print the contents of $EXTRA_ENV to the file, we have to make sure to include the "\n" at the end.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Submitted to Debian:

https://salsa.debian.org/ci-team/autopkgtest/-/merge_requests/134

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ssh-setup/nova b/ssh-setup/nova
2index bff8dae..4524215 100755
3--- a/ssh-setup/nova
4+++ b/ssh-setup/nova
5@@ -246,7 +246,7 @@ $MIRROR
6 runcmd:
7 - echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/90nolanguages
8 - echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/autopkgtest
9- - printf '$EXTRA_ENV' >> /etc/environment
10+ - printf '${EXTRA_ENV}\n' >> /etc/environment
11 - sed -i -r '/^127.0.1.1/ s/autopkgtest-[^ ]+\\./autopkgtest\\./' /etc/hosts
12 EOF
13

Subscribers

People subscribed via source and target branches