Fix NetworkManager crashes on 24.04 (#419)

* Fix NetworkManager crashes on 24.04 * rm that
commaai · Dec 16, 2024 · 68d829a · 68d829a
1 parent a0a08bf
commit 68d829a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile.agnos b/Dockerfile.agnos
@@ -166,7 +166,6 @@ COPY ./userspace/firmware/* /lib/firmware/
 # populate /etc
 COPY ./userspace/files/fstab /etc
 COPY ./userspace/files/profile /etc/profile
-COPY --chown=root:root ./userspace/files/01-network-manager-all.yaml /etc/netplan/
 COPY ./userspace/files/allow-network-control.pkla /etc/polkit-1/localauthority/50-local.d/allow-network-control.pkla
 COPY ./userspace/files/allow-modem-control.pkla /etc/polkit-1/localauthority/50-local.d/allow-modem-control.pkla
 COPY ./userspace/files/*.rules /etc/udev/rules.d/

diff --git a/agnos-kernel-sdm845 b/agnos-kernel-sdm845
diff --git a/userspace/files/01-network-manager-all.yaml b/userspace/files/01-network-manager-all.yaml
diff --git a/userspace/readonly_setup.sh b/userspace/readonly_setup.sh
@@ -11,6 +11,8 @@ rm /etc/ssh/ssh_host*
 
 rm -rf /etc/NetworkManager/system-connections
 ln -s /data/etc/NetworkManager/system-connections /etc/NetworkManager/system-connections
+rm -rf /etc/netplan/
+ln -s /data/etc/netplan/ /etc/netplan
 
 # setup /usr/default for defaults
 mkdir /usr/default/

diff --git a/userspace/usr/comma/fs_setup.sh b/userspace/usr/comma/fs_setup.sh
@@ -16,6 +16,7 @@ mount -t overlay overlay -o lowerdir=/usr/default/home,upperdir=/tmprw/home_uppe
 mkdir -p /data/etc
 touch /data/etc/timezone
 touch /data/etc/localtime
+mkdir -p /data/etc/netplan
 mkdir -p /data/etc/NetworkManager/system-connections
 
 # /data/media - NVME mount point