Merge branch 'cloud-init-and-u-d-i' of git+ssh://git.launchpad.net/~dbungert/livecd-rootfs into ubuntu/master

ui-by-default-wip
Łukasz 'sil2100' Zemczak 2 years ago
commit c335e6ed8b

6
debian/changelog vendored

@ -1,3 +1,9 @@
livecd-rootfs (2.812) UNRELEASED; urgency=medium
* Inform cloud-init when network manager is in use. (LP: #1982855)
-- Dan Bungert <daniel.bungert@canonical.com> Thu, 09 Mar 2023 14:59:17 -0600
livecd-rootfs (2.811) lunar; urgency=medium livecd-rootfs (2.811) lunar; urgency=medium
[ John Chittum ] [ John Chittum ]

@ -1006,6 +1006,27 @@ network:
version: 2 version: 2
renderer: NetworkManager renderer: NetworkManager
EOF EOF
# inform cloud-init of the same (LP: #1982855)
mkdir -p chroot/etc/cloud/cloud.cfg.d
cat <<EOF > chroot/etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg
# Let NetworkManager manage all devices on this system
system_info:
network:
renderers: ['network-manager']
activators: ['network-manager']
EOF
# Allow cloud-init clean to inform of strict network-manager config
mkdir -p chroot/etc/cloud/clean.d
cat <<EOF > chroot/etc/cloud/clean.d/99-installer-use-networkmanager
# Inform clone image creators about strict network-manager cfg for cloud-init
if [ -f /etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg ]; then
echo "WARNING: cloud-init network config is limited to using network-manager."
echo "If this is undesirable: rm /etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg"
fi
EOF
chmod +x chroot/etc/cloud/clean.d/99-installer-use-networkmanager
else else
echo "==== NetworkManager not installed ====" echo "==== NetworkManager not installed ===="
fi fi

Loading…
Cancel
Save