Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-30 20:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Key netplan delegation to NetworkManager on presence of

Browse Source 
/usr/sbin/NetworkManager, not on /usr/lib/NetworkManager which may have
hooks from other packages (i.e., wpasupplicant).
This commit is contained in:
Steve Langasek 2018-12-06 13:48:12 +02:00
parent 209f1857f2
commit 8b65ec6c2c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.525.12) UNRELEASED; urgency=medium
* Key netplan delegation to NetworkManager on presence of
/usr/sbin/NetworkManager, not on /usr/lib/NetworkManager which may have
hooks from other packages (i.e., wpasupplicant).
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 06 Dec 2018 13:47:54 +0200
livecd-rootfs (2.525.11) bionic; urgency=medium livecd-rootfs (2.525.11) bionic; urgency=medium
* Backport all the required changes to enable Raspberry Pi 3 armhf and arm64 * Backport all the required changes to enable Raspberry Pi 3 armhf and arm64

2
live-build/auto/build
View File

@ -415,7 +415,7 @@ EOF
# default. Installing NM on an existing system only manages wifi and wwan via # default. Installing NM on an existing system only manages wifi and wwan via
# /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf. When setting # /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf. When setting
# the global backend to NM, netplan overrides that file. # the global backend to NM, netplan overrides that file.
if [ -d chroot/usr/lib/NetworkManager ]; then if [ -e chroot/usr/sbin/NetworkManager ]; then
echo "===== Enabling all devices in NetworkManager ====" echo "===== Enabling all devices in NetworkManager ===="
mkdir -p chroot/etc/netplan mkdir -p chroot/etc/netplan
cat <<EOF > chroot/etc/netplan/01-network-manager-all.yaml cat <<EOF > chroot/etc/netplan/01-network-manager-all.yaml