Skip to content

Commit d85c8bd

Browse files
pothospothos
committed
sys-apps/systemd: Sync with Gentoo to update to 258.2
From d45a090cf70ae75de9e22b54016b049a90f7abc8 Signed-off-by: Kai Lueke <kailuke@microsoft.com>
1 parent 91140e9 commit d85c8bd

File tree

9 files changed

+58
-1768
lines changed

9 files changed

+58
-1768
lines changed

‎changelog/updates/2025-12-08-update-systemd.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- systemd (258.2)

‎sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/systemd/0001-wait-online-set-any-by-default.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 83043596b6cc74b6f049999fa660afd983dc493a Mon Sep 17 00:00:00 2001
1+
From 61ae07bbf1d7032eef32137b1fe299647602e3de Mon Sep 17 00:00:00 2001
22
From: David Michael <dm0@redhat.com>
33
Date: Tue, 16 Apr 2019 02:44:51 +0000
4-
Subject: [PATCH 1/8] wait-online: set --any by default
4+
Subject: [PATCH] wait-online: set --any by default
55

66
The systemd-networkd-wait-online command would normally continue
77
waiting after a network interface is usable if other interfaces are
@@ -11,22 +11,22 @@ Preserve previous Container Linux behavior for compatibility by
1111
setting the --any flag by default. See patches from v241 (or
1212
earlier) for the original implementation.
1313
---
14-
src/network/wait-online/wait-online.c | 2 +-
15-
1 file changed, 1 insertion(+), 1 deletion(-)
14+
src/network/wait-online/wait-online.c | 3 ++-
15+
1 file changed, 2 insertions(+), 1 deletion(-)
1616

1717
diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
18-
index 6f5aef903a..0acb3e76b9 100644
18+
index b1d0b9cde2..e07c11d807 100644
1919
--- a/src/network/wait-online/wait-online.c
2020
+++ b/src/network/wait-online/wait-online.c
21-
@@ -21,7 +21,7 @@ static Hashmap *arg_interfaces = NULL;
21+
@@ -24,7 +24,7 @@ static Hashmap *arg_interfaces = NULL;
2222
static char **arg_ignore = NULL;
2323
static LinkOperationalStateRange arg_required_operstate = LINK_OPERSTATE_RANGE_INVALID;
2424
static AddressFamily arg_required_family = ADDRESS_FAMILY_NO;
2525
-static bool arg_any = false;
2626
+static bool arg_any = true;
27+
static bool arg_requires_dns = false;
2728

28-
STATIC_DESTRUCTOR_REGISTER(arg_interfaces, hashmap_free_free_freep);
29-
STATIC_DESTRUCTOR_REGISTER(arg_ignore, strv_freep);
29+
STATIC_DESTRUCTOR_REGISTER(arg_interfaces, hashmap_freep);
3030
--
3131
2.51.0
3232

‎sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/systemd/0005-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 8064e1544a2b89f8389c0469ed4879a287a045a7 Mon Sep 17 00:00:00 2001
1+
From 306da1d06e84a721ac34fbc303b4629b2c1c7257 Mon Sep 17 00:00:00 2001
22
From: Sayan Chowdhury <schowdhury@microsoft.com>
33
Date: Fri, 16 Dec 2022 16:28:26 +0530
4-
Subject: [PATCH 5/8] Revert "getty: Pass tty to use by agetty via stdin"
4+
Subject: [PATCH] Revert "getty: Pass tty to use by agetty via stdin"
55

66
This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c.
77

@@ -17,15 +17,15 @@ Signed-off-by: Sayan Chowdhury <schowdhury@microsoft.com>
1717
4 files changed, 4 insertions(+), 12 deletions(-)
1818

1919
diff --git a/units/console-getty.service.in b/units/console-getty.service.in
20-
index 33e6368db1..1f2d8b910f 100644
20+
index 967d8337ab..cde822afc8 100644
2121
--- a/units/console-getty.service.in
2222
+++ b/units/console-getty.service.in
23-
@@ -22,12 +22,10 @@ ConditionPathExists=/dev/console
23+
@@ -20,12 +20,10 @@ Before=getty.target
24+
ConditionPathExists=/dev/console
25+
2426
[Service]
25-
# The '-o' option value tells agetty to replace 'login' arguments with '--' for
26-
# safety, and then the entered username.
27-
-ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear --keep-baud 115200,57600,38400,9600 - ${TERM}
28-
+ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear --keep-baud 115200,57600,38400,9600 console ${TERM}
27+
-ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM}
28+
+ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 console ${TERM}
2929
Type=idle
3030
Restart=always
3131
UtmpIdentifier=cons
@@ -35,15 +35,15 @@ index 33e6368db1..1f2d8b910f 100644
3535
TTYReset=yes
3636
TTYVHangup=yes
3737
diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in
38-
index 7573532d6d..5f27653d1f 100644
38+
index e0b27613df..2868d56ad0 100644
3939
--- a/units/container-getty@.service.in
4040
+++ b/units/container-getty@.service.in
41-
@@ -27,13 +27,11 @@ Before=rescue.service
41+
@@ -25,13 +25,11 @@ Conflicts=rescue.service
42+
Before=rescue.service
43+
4244
[Service]
43-
# The '-o' option value tells agetty to replace 'login' arguments with '--' for
44-
# safety, and then the entered username.
45-
-ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear - ${TERM}
46-
+ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear pts/%I ${TERM}
45+
-ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM}
46+
+ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d pts/%I ${TERM}
4747
Type=idle
4848
Restart=always
4949
RestartSec=0
@@ -54,15 +54,15 @@ index 7573532d6d..5f27653d1f 100644
5454
TTYReset=yes
5555
TTYVHangup=yes
5656
diff --git a/units/getty@.service.in b/units/getty@.service.in
57-
index f30bba406d..1819627d1c 100644
57+
index 104c4acc96..bedf0aae54 100644
5858
--- a/units/getty@.service.in
5959
+++ b/units/getty@.service.in
60-
@@ -36,13 +36,11 @@ ConditionPathExists=/dev/tty0
60+
@@ -34,13 +34,11 @@ Before=rescue.service
61+
ConditionPathExists=/dev/tty0
62+
6163
[Service]
62-
# The '-o' option value tells agetty to replace 'login' arguments with '--' for
63-
# safety, and then the entered username.
64-
-ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear - ${TERM}
65-
+ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear %I ${TERM}
64+
-ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d - ${TERM}
65+
+ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d %I ${TERM}
6666
Type=idle
6767
Restart=always
6868
RestartSec=0
@@ -73,15 +73,15 @@ index f30bba406d..1819627d1c 100644
7373
TTYReset=yes
7474
TTYVHangup=yes
7575
diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in
76-
index 20a5eb2754..ba4cbc0edb 100644
76+
index 0134c83d48..7e5c8797ca 100644
7777
--- a/units/serial-getty@.service.in
7878
+++ b/units/serial-getty@.service.in
79-
@@ -32,12 +32,10 @@ Before=rescue.service
79+
@@ -30,12 +30,10 @@ Conflicts=rescue.service
80+
Before=rescue.service
81+
8082
[Service]
81-
# The '-o' option value tells agetty to replace 'login' arguments with '--' for
82-
# safety, and then the entered username.
83-
-ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear --keep-baud 115200,57600,38400,9600 - ${TERM}
84-
+ExecStart=-/sbin/agetty -o '-- \\u' --noreset --noclear --keep-baud 115200,57600,38400,9600 %I ${TERM}
83+
-ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 - ${TERM}
84+
+ExecStart=-/sbin/agetty --noreset --noclear --issue-file=/etc/issue:/etc/issue.d:/run/issue.d:/usr/lib/issue.d --keep-baud 115200,57600,38400,9600 %I ${TERM}
8585
Type=idle
8686
Restart=always
8787
UtmpIdentifier=%I

‎sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-apps/systemd/0008-units-Make-multi-user.target-the-default-target.patch‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
1-
From f0ab1c6c59056afe1650f749d1af6ecc6ee8f5ec Mon Sep 17 00:00:00 2001
1+
From 3c13363e4b3f2e5bcc762a71460d84b93452f53f Mon Sep 17 00:00:00 2001
22
From: Krzesimir Nowak <knowak@microsoft.com>
33
Date: Fri, 24 Oct 2025 11:06:57 +0200
4-
Subject: [PATCH 8/8] units: Make multi-user.target the default target
4+
Subject: [PATCH] units: Make multi-user.target the default target
55

66
Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
7+
Signed-off-by: Kai Lueke <kailuke@microsoft.com>
78
---
8-
units/meson.build | 4 ++--
9-
1 file changed, 2 insertions(+), 2 deletions(-)
9+
units/meson.build | 4 +++-
10+
1 file changed, 3 insertions(+), 1 deletion(-)
1011

1112
diff --git a/units/meson.build b/units/meson.build
12-
index ef18dcae4a..887231840f 100644
13+
index 4f47a3b2bd..9663e21e0c 100644
1314
--- a/units/meson.build
1415
+++ b/units/meson.build
15-
@@ -46,7 +46,7 @@ units = [
16+
@@ -48,8 +48,7 @@ units = [
17+
'symlinks' : ['autovt@.service'],
1618
},
1719
{
18-
'file' : 'graphical.target',
19-
- 'symlinks' : ['default.target'] + (with_runlevels ? ['runlevel5.target'] : []),
20-
+ 'symlinks' : with_runlevels ? ['runlevel5.target'] : [],
20+
- 'file' : 'graphical.target',
21+
- 'symlinks' : ['default.target'],
22+
+ 'file' : 'graphical.target'
2123
},
2224
{ 'file' : 'halt.target' },
2325
{
24-
@@ -140,7 +140,7 @@ units = [
25-
{ 'file' : 'modprobe@.service' },
26-
{
27-
'file' : 'multi-user.target',
28-
- 'symlinks' : with_runlevels ? ['runlevel2.target', 'runlevel3.target', 'runlevel4.target'] : [],
29-
+ 'symlinks' : ['default.target'] + (with_runlevels ? ['runlevel2.target', 'runlevel3.target', 'runlevel4.target'] : []),
26+
@@ -142,7 +141,9 @@ units = [
27+
'conditions' : ['ENABLE_MACHINED'],
3028
},
29+
{ 'file' : 'modprobe@.service' },
30+
- { 'file' : 'multi-user.target' },
31+
+ { 'file' : 'multi-user.target' ,
32+
+ 'symlinks' : ['default.target']
33+
+ },
3134
{ 'file' : 'network-online.target' },
3235
{ 'file' : 'network-pre.target' },
36+
{ 'file' : 'network.target' },
3337
--
3438
2.51.0
35-

‎sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,6 @@ sys-apps/azure-vm-utils
101101

102102
=app-containers/containerd-2.1* ~amd64 ~arm64
103103
=app-containers/runc-1.3* ~amd64 ~arm64
104+
105+
# Use new systemd
106+
=sys-apps/systemd-258.2 ~amd64 ~arm64

‎sdk_container/src/third_party/portage-stable/sys-apps/systemd/Manifest‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
DIST systemd-257.10.tar.gz 16425661 BLAKE2B c8fef145933810110f5470f64dd41213864cc1cae889fb306c817d7a16cc300adbcab27e3a3be91428f0a7d354041f7f9ca431f7745bce9c7cc1e3bb065be84a SHA512 49a2c8cc1cd91363d90165a1145dcc417d524afd428917dad332e4b057ed9fc3ddb5b4beafab094b02a85d930c8aef9b63c8c9c1bc76ef3bdf0ce38a7d46466f
2-
DIST systemd-257.9.tar.gz 16401765 BLAKE2B c3ad528d37b89de8f82548807e950b59aab43f875a533ad983169eb539594e5e8230b6b562caee5297dcec4572e27df0e53ebee04f79e85f429f47862031592e SHA512 23b3d2764e0f990d8373068ccb41177793413bc193f7bd34e38b03d6fc3cd32d07c86e9dcbf07e32904075bb5eeca208f65beab04d628ac0e0b81ba87a975c1b
31
DIST systemd-258.2.tar.gz 16989522 BLAKE2B 55c8a134d2c80241ed654fab6bf2df0a2139313dbbb905f3abf07c9f86940ff03c8787fe7c4604c34bbb84088c15cd73ae5e013929b290b92808b5473550235e SHA512 1dc016a5a037aec2682e08d2add0dcf8d03db15b45ce8c6b677898f734aefd4694ce18e588d579e42514071fc4c167b2bf53808478b2bd3856b257c9fbcde45d
2+
DIST systemd-258.tar.gz 16976853 BLAKE2B c63bc09bff11ba4cf6e87bef689250a6b354bf8f5bfb5af6d2a173fa1e1838aa457a8a7db66f7aad20dae25b7a0defddcb052d53f18a688a2dd6d5f323d4692a SHA512 c488354da1c170ad02e10926f561d1985c3c3393fec878562f295ef764fdf3a1b2877c3b2549253f19bf23e357be6e443a50b937f60f4677f286d3402d611b85

0 commit comments

Comments
 (0)