feature/ublock-origin-preinstall #116

Merged
clawdie merged 4 commits from feature/ublock-origin-preinstall into main 2026-06-23 07:14:40 +02:00
Showing only changes of commit 4ee66eb45c - Show all commits

View file

@ -864,6 +864,16 @@ install_live_runtime_packages() {
exit 1
fi
# Lock the repacked networkmgr package so pkg upgrade doesn't replace it
# with the upstream version that depends on sudo. The ISO uses mdo/mac_do
# instead of sudo; see override_networkmgr_package() above.
if ! chroot "${MOUNT_POINT}" /usr/local/sbin/pkg lock -y networkmgr; then
[ "$_mounted_procfs" -eq 1 ] && umount "${MOUNT_POINT}/proc" 2>/dev/null || true
[ "$_mounted_devfs" -eq 1 ] && umount "${MOUNT_POINT}/dev" 2>/dev/null || true
echo "ERROR: failed to lock networkmgr package on live image"
exit 1
fi
refresh_live_desktop_caches
[ "$_mounted_procfs" -eq 1 ] && umount "${MOUNT_POINT}/proc" 2>/dev/null || true