Skip to content

fix: netplan: upgrade 1.1.2 -> 1.2.1 (Fedora f44 import) to fix PID1 generator deadlock #17815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bfjelds wants to merge 1 commit into
base: 4.0
Choose a base branch
from
Open

fix: netplan: upgrade 1.1.2 -> 1.2.1 (Fedora f44 import) to fix PID1 generator deadlock #17815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion base/comps/components.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,7 +2178,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.netcdf-cxx]
[components.netlabel_tools]
[components.netpbm]
[components.netplan]
[components.nettle]
[components.network-manager-applet]
[components.newt]
Expand Down
12 changes: 12 additions & 0 deletions base/comps/netplan/netplan.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Upgrade netplan 1.1.2 -> 1.2.1 by moving the dist-git import pointer from the
# global Fedora f43 snapshot to the Fedora f44 head.
#
# f44 ships netplan 1.2.1-2, which contains the upstream generate/configure
# split (PR #552, first released in 1.2). That split makes the boot-time
# systemd generator validation-only and defers virtual-device creation to
# netplan-configure.service, resolving the AZL4 rollback PID1 generator
# self-deadlock (getgrnam NSS lookup under the generator sandbox).
#
# Fedora f44 dist-git: https://src.fedoraproject.org/rpms/netplan/commits/f44
[components.netplan]
spec = { type = "upstream", upstream-distro = { name = "fedora", version = "44" }, upstream-commit = "66c31bcd3e9aeb8d15a5b4184009e57d799b0158" }
6 changes: 3 additions & 3 deletions locks/netplan.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Managed by azldev component update. Do not edit manually.
version = 1
import-commit = 'cf326c3fc62b1588db0c9c2bc006946d572e7636'
upstream-commit = 'cf326c3fc62b1588db0c9c2bc006946d572e7636'
input-fingerprint = 'sha256:e9ab4f13fcdf4f80674cb76630cd9f870549e84767ac0c85a1dbfd9fc30da922'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
upstream-commit = '66c31bcd3e9aeb8d15a5b4184009e57d799b0158'
input-fingerprint = 'sha256:508a5f729ebc07d70f2dbfff24e4993b6d0cd2784354cb20b3f54cdf9d43e749'
resolution-input-hash = 'sha256:9daf4c01a90bab4922abb6c6386bd863c91a74133383a966fe5fc6cfe6fcd63a'
21 changes: 16 additions & 5 deletions specs/n/netplan/netplan.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,15 @@
%bcond_with tests

Name: netplan
Version: 1.1.2
Release: 5%{?dist}
Version: 1.2.1
Release: 4%{?dist}
Summary: Network configuration tool using YAML
License: GPL-3.0-only
URL: http://netplan.io/
Source0: https://github.com/canonical/%{name}/archive/%{version}/%{name}-%{version}.tar.gz

# Downstream only
Patch1001: netplan-fallback-renderer.patch
# https://github.com/canonical/netplan/pull/555
# probably won't be necessary in > 1.1.2
Patch1002: status_fail_cleanly.patch

BuildRequires: gcc
BuildRequires: meson
Expand All @@ -43,6 +40,7 @@ BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(yaml-0.1)
BuildRequires: pkgconfig(uuid)
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: systemd-rpm-macros
BuildRequires: %{_bindir}/pandoc
BuildRequires: python3dist(cffi)
Expand Down Expand Up @@ -81,6 +79,8 @@ Requires: python3-%{name}%{?_isa} = %{version}-%{release}
Provides: %{ubuntu_name} = %{version}-%{release}
Provides: %{ubuntu_name}%{?_isa} = %{version}-%{release}

# provides "netplan status" functionality
Suggests: systemd-networkd


%description
Expand All @@ -104,8 +104,10 @@ Currently supported backends are NetworkManager and systemd-networkd.
%dir %{_sysconfdir}/%{name}
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/generate
%{_libexecdir}/%{name}/configure
%{_libexecdir}/%{name}/%{name}-dbus
%{_datadir}/bash-completion/completions/%{name}
%{_unitdir}/netplan-configure.service

# ------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -285,6 +287,15 @@ EOF


%changelog
* Tue May 05 2026 Jonathan Wright <jonathan@almalinux.org> - 1.2.1-2
- Suggest systemd-networkd for "netplan status" functionality

* Tue May 05 2026 Jonathan Wright <jonathan@almalinux.org> - 1.2.1-1
- update to netplan 1.2.1 rhbz#2422802

* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.1.2-4
- Rebuilt for Python 3.14.0rc3 bytecode

Expand Down
2 changes: 1 addition & 1 deletion specs/n/netplan/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SHA512 (netplan-1.1.2.tar.gz) = 717c0da58de37f764332883881ae6185fd932d55256a88122b8462a51eeb0bef123f29e75f897e067b6d1b1fdcf67f6eba0054146609deb4456c1cf673bd794c
SHA512 (netplan-1.2.1.tar.gz) = c347d5f086bc25010dd25022d87c5859b366592112f1a506af3885e2f16a8af66c7f6a61e1bf0effe8ac5bd32222235f2f51f3f4cbdaae36d4c3f98aa8b92999
99 changes: 0 additions & 99 deletions specs/n/netplan/status_fail_cleanly.patch
View file
Open in desktop

This file was deleted.

Loading