openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Stop creating default user for cloud-init"

This commit is contained in:
Zuul 2023-10-12 20:53:57 +00:00 committed by Gerrit Code Review
parent 87e2321d55 cff37ce502
commit 0576fadab8
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
diskimage_builder/elements/debian/install.d/10-cloud-opinions
View File

@ -20,20 +20,23 @@ if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
fi
set -eu
set -o pipefail
case "${DIB_RELEASE}" in
hamm|slink|potato|woody|sarge|etch|lenny|squeeze|wheezy)
DIB_DEBIAN_ALT_INIT_PACKAGE=${DIB_DEBIAN_ALT_INIT_PACKAGE:-sysvinit}
DIB_DEBIAN_CLOUD_INIT_HELPER=${DIB_DEBIAN_CLOUD_INIT_HELPER:-'true'}
;;
*)
DIB_DEBIAN_ALT_INIT_PACKAGE=${DIB_DEBIAN_ALT_INIT_PACKAGE:-systemd-sysv}
;;
esac
adduser --gecos Debian-cloud-init-user --disabled-password --quiet debian
install -d -m 0755 -o root -g root /etc/sudoers.d
echo 'debian ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/debian-cloud-init
chmod 0440 /etc/sudoers.d/debian-cloud-init
if [ -n "${DIB_DEBIAN_CLOUD_INIT_HELPER:-}" ]; then
adduser --gecos Debian-cloud-init-user --disabled-password --quiet debian
install -d -m 0755 -o root -g root /etc/sudoers.d
echo 'debian ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/debian-cloud-init
chmod 0440 /etc/sudoers.d/debian-cloud-init
fi
if [ "$DIB_DEBIAN_ALT_INIT_PACKAGE" != "sysvinit" ]; then
# To avoid a conflict against an essential package, we need to remove sysvinit first

8
releasenotes/notes/debian_cloud_init-8d91b34b96c621fe.yaml Normal file
View File

@ -0,0 +1,8 @@
---
other:
- |
Added a ``DIB_DEBIAN_CLOUD_INIT_HELPER`` variable that controls whether
``debian`` element will attempt to pre-create required users and sudoers
file for the default cloud-init user. This should not be needed for any
modern Debian distro.