Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
From 7eecfffbf7642d6c4c2d33243225ff6e6047bd59 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 23 Jun 2026 18:26:28 +0200
Subject: [PATCH] Revert "systemd: Add noop sysupdate transfer config"

This reverts commit de81605b7c10de0c547edc5b919fc163560f9844.
---
Makefile | 2 --
sysupdate.d/noop.transfer | 8 --------
2 files changed, 10 deletions(-)
delete mode 100644 sysupdate.d/noop.transfer

diff --git a/Makefile b/Makefile
index 90d2a14..1b1495b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ install:
$(DESTDIR)/usr/bin \
$(DESTDIR)/usr/sbin \
$(DESTDIR)/usr/lib/flatcar \
- $(DESTDIR)/usr/lib/sysupdate.d \
$(DESTDIR)/usr/lib/systemd/system \
$(DESTDIR)/usr/lib/systemd/network \
$(DESTDIR)/usr/lib/systemd/system-generators \
@@ -34,7 +33,6 @@ install:
install -m 644 configs/modules-load.d/* $(DESTDIR)/usr/lib/modules-load.d/
install -m 644 configs/tmpfiles.d/* $(DESTDIR)/usr/lib/tmpfiles.d/
cp -a systemd/* $(DESTDIR)/usr/lib/systemd/
- cp -a sysupdate.d/* $(DESTDIR)/usr/lib/sysupdate.d/
chmod 755 $(DESTDIR)/usr/lib/systemd/system-generators/*
ln -sf ../run/issue $(DESTDIR)/etc/issue
ln -sfT flatcar $(DESTDIR)/usr/lib/coreos
diff --git a/sysupdate.d/noop.transfer b/sysupdate.d/noop.transfer
deleted file mode 100644
index a591a2e..0000000
--- a/sysupdate.d/noop.transfer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Source]
-Type=regular-file
-Path=/
-MatchPattern=invalid@v.raw
-[Target]
-Type=regular-file
-Path=/
-MatchPattern=invalid@v.raw
--
2.53.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
From c57f7efee706ce3bd0f12e87036c2edbde442403 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Tue, 25 Aug 2026 15:05:52 +0200
Subject: [PATCH] sysupdate: do not fail when no transfers are defined

Comment on lines +1 to +5
sysupdate operations like 'list', 'reboot', etc.
should not fail when no transfers are defined.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
src/sysupdate/sysupdate.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 925e855a4a..ca8f627d86 100644
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -1373,7 +1373,7 @@ static int verb_features(int argc, char *argv[], uintptr_t _data, void *userdata
return r;

r = context_make_offline(&context, loop_device ? loop_device->node : NULL,
- READ_DEFINITIONS_REQUIRES_ANY_TRANSFERS);
+ /* read_definition_flags= */ 0);
if (r < 0)
return r;

@@ -1642,7 +1642,7 @@ static int verb_vacuum(int argc, char *argv[], uintptr_t _data, void *userdata)
return r;

r = context_make_offline(&context, loop_device ? loop_device->node : NULL,
- READ_DEFINITIONS_REQUIRES_ANY_TRANSFERS);
+ /* read_definitions_flags= */ 0);
if (r < 0)
Comment on lines +21 to +33
return r;

@@ -1665,7 +1665,7 @@ static int verb_pending_or_reboot(int argc, char *argv[], uintptr_t _data, void
"The --root=/--image= switches may not be combined with the '%s' operation.", argv[0]);

r = context_make_offline(&context, /* node= */ NULL,
- READ_DEFINITIONS_REQUIRES_ENABLED_TRANSFERS | READ_DEFINITIONS_REQUIRES_ANY_TRANSFERS);
+ READ_DEFINITIONS_REQUIRES_ENABLED_TRANSFERS);
if (r < 0)
return r;
Comment on lines +18 to +43

@@ -1674,8 +1674,13 @@ static int verb_pending_or_reboot(int argc, char *argv[], uintptr_t _data, void
r = context_discover_update_sets_by_flag(context, UPDATE_INSTALLED);
if (r < 0)
return r;
- if (!context->newest_installed)
+ if (!context->newest_installed) {
+ if (context->n_transfers == 0) {
+ log_warning("Couldn't find any suitable installed versions.");
+ return 0;
+ }
return log_error_errno(SYNTHETIC_ERRNO(ENODATA), "Couldn't find any suitable installed versions.");
+ }

r = parse_os_release(arg_root, "IMAGE_VERSION", &booted_version);
if (r < 0) /* yes, arg_root is NULL here, but we have to pass something, and it's a lot more readable
--
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c16ef94786281a7a75c498f33995191f7e1cc93d Mon Sep 17 00:00:00 2001
From e1ae9447fa048c3668c1f1f6f0eb5dddd6543e64 Mon Sep 17 00:00:00 2001
From: David Michael <dm0@redhat.com>
Date: Tue, 16 Apr 2019 02:44:51 +0000
Subject: [PATCH 1/8] wait-online: set --any by default
Expand All @@ -15,10 +15,10 @@ earlier) for the original implementation.
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index b1d0b9cde2..e07c11d807 100644
index e566f89d02..323041be40 100644
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -24,7 +24,7 @@ static Hashmap *arg_interfaces = NULL;
@@ -25,7 +25,7 @@ static Hashmap *arg_interfaces = NULL;
static char **arg_ignore = NULL;
static LinkOperationalStateRange arg_required_operstate = LINK_OPERSTATE_RANGE_INVALID;
static AddressFamily arg_required_family = ADDRESS_FAMILY_NO;
Expand All @@ -28,5 +28,5 @@ index b1d0b9cde2..e07c11d807 100644

STATIC_DESTRUCTOR_REGISTER(arg_interfaces, hashmap_freep);
--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ec321c3a3888014f94d782c8f6454745a96bfaab Mon Sep 17 00:00:00 2001
From 05779c9c7aa309c4e864e4263355f0b23259a439 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Wed, 2 Mar 2016 10:46:33 -0800
Subject: [PATCH 2/8] needs-update: don't require strictly newer usr
Expand All @@ -10,7 +10,7 @@ Updates should be triggered whenever usr changes, not only when it is newer.
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/man/systemd-update-done.service.xml b/man/systemd-update-done.service.xml
index d9d78262a1..761bbdecca 100644
index 8bb92ca5b5..8b65659b69 100644
--- a/man/systemd-update-done.service.xml
+++ b/man/systemd-update-done.service.xml
@@ -49,7 +49,7 @@
Expand All @@ -23,10 +23,10 @@ index d9d78262a1..761bbdecca 100644
This requires that updates to <filename>/usr/</filename> are always
followed by an update of the modification time of
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 903662edf1..9157b53e2f 100644
index 2b4a29ed5c..a479ea11ab 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -817,7 +817,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
@@ -926,7 +926,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
* First, compare seconds as they are always accurate...
*/
if (usr.st_mtim.tv_sec != other.st_mtim.tv_sec)
Expand All @@ -35,7 +35,7 @@ index 903662edf1..9157b53e2f 100644

/*
* ...then compare nanoseconds.
@@ -828,7 +828,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
@@ -937,7 +937,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
* (otherwise the filesystem supports nsec timestamps, see stat(2)).
*/
if (usr.st_mtim.tv_nsec == 0 || other.st_mtim.tv_nsec > 0)
Expand All @@ -44,7 +44,7 @@ index 903662edf1..9157b53e2f 100644

_cleanup_free_ char *timestamp_str = NULL;
r = parse_env_file(NULL, p, "TIMESTAMP_NSEC", &timestamp_str);
@@ -848,7 +848,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
@@ -957,7 +957,7 @@ static int condition_test_needs_update(Condition *c, char **env) {
return true;
}

Expand All @@ -54,5 +54,5 @@ index 903662edf1..9157b53e2f 100644

static bool in_first_boot(void) {
--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5e8b4b38473018964ac462a0c0aa9ec994945828 Mon Sep 17 00:00:00 2001
From 2c6a64e63e8197a373b9c7fa39197e7af29432f9 Mon Sep 17 00:00:00 2001
From: Adrian Vladu <avladu@cloudbasesolutions.com>
Date: Fri, 16 Feb 2024 11:22:08 +0000
Subject: [PATCH 3/8] core: use max for DefaultTasksMax
Expand All @@ -21,7 +21,7 @@ Signed-off-by: Adrian Vladu <avladu@cloudbasesolutions.com>
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index b7fe53dc9c..175fe67139 100644
index e33267409b..d37bd8c456 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -227,7 +227,7 @@
Expand All @@ -34,10 +34,10 @@ index b7fe53dc9c..175fe67139 100644
Kernel has a default value for <varname>kernel.pid_max=</varname> and an algorithm of counting in case of more than 32 cores.
For example, with the default <varname>kernel.pid_max=</varname>, <varname>DefaultTasksMax=</varname> defaults to 4915,
diff --git a/src/core/manager.c b/src/core/manager.c
index 79fa19d976..d83b5b38b0 100644
index 74c9d3e7aa..7a46141a5f 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -113,7 +113,7 @@
@@ -117,7 +117,7 @@
/* How many units and jobs to process of the bus queue before returning to the event loop. */
#define MANAGER_BUS_MESSAGE_BUDGET 100U

Expand All @@ -47,10 +47,10 @@ index 79fa19d976..d83b5b38b0 100644
static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
diff --git a/src/core/system.conf.in b/src/core/system.conf.in
index 54196e8489..b0b5c78b56 100644
index aa8208ca1d..fbfef9ec37 100644
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@@ -58,7 +58,7 @@
@@ -60,7 +60,7 @@
#DefaultIPAccounting=no
#DefaultMemoryAccounting={{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }}
#DefaultTasksAccounting=yes
Expand All @@ -60,5 +60,5 @@ index 54196e8489..b0b5c78b56 100644
#DefaultLimitFSIZE=
#DefaultLimitDATA=
--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5c6b08088fe16e40e0aaaf501950d711a421fb99 Mon Sep 17 00:00:00 2001
From ae75b3f399be2e1beb0e82fa526140c882b4979d Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Tue, 20 Dec 2016 16:43:22 +0000
Subject: [PATCH 4/8] systemd: Disable SELinux permissions checks
Expand All @@ -25,5 +25,5 @@ index 7457b3d456..82afe343dd 100644
#include <unistd.h>

--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6c97801bdec3730f49f68683b141909145826f2f Mon Sep 17 00:00:00 2001
From 7ba8b1d2428b4ad3da9e391fcbb622ac41d13963 Mon Sep 17 00:00:00 2001
From: Sayan Chowdhury <schowdhury@microsoft.com>
Date: Fri, 16 Dec 2022 16:28:26 +0530
Subject: [PATCH 5/8] Revert "getty: Pass tty to use by agetty via stdin"
Expand Down Expand Up @@ -99,5 +99,5 @@ index d89805a0ef..73d88541fe 100644
TTYReset=yes
TTYVHangup=yes
--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c05273535a1d96e187c7837929f0c88bfbf0ae68 Mon Sep 17 00:00:00 2001
From 9378b6c6241970fb7eda54300064f5a107073793 Mon Sep 17 00:00:00 2001
From: Adrian Vladu <avladu@cloudbasesolutions.com>
Date: Fri, 16 Feb 2024 11:29:04 +0000
Subject: [PATCH 6/8] units: Keep using old journal file format
Expand Down Expand Up @@ -38,5 +38,5 @@ index b705ce08ff..874701dac4 100644
FileDescriptorStoreMax=4224
Group=systemd-journal
--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e8de255a0141ab8d169488338dc24f391299d653 Mon Sep 17 00:00:00 2001
From c3aed9f204d93c75166b00f37355be34507d9e8e Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 22 Oct 2025 10:39:42 +0200
Subject: [PATCH 7/8] tmpfiles.d: Fix DNS issues with default k8s configuration
Expand Down Expand Up @@ -32,5 +32,5 @@ index be5edc98e0..bea686682a 100644
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
+L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 450c8acb76f851bb594f725f834c04b041c2859e Mon Sep 17 00:00:00 2001
From a955d445702a754e9bd1883b68fd994f9c35152a Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Fri, 24 Oct 2025 11:06:57 +0200
Subject: [PATCH 8/8] units: Make multi-user.target the default target
Expand All @@ -9,7 +9,7 @@ Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/units/meson.build b/units/meson.build
index b2cf9bd8f3..74d7f61519 100644
index 27d8ef2f72..282d178c4a 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -48,7 +48,7 @@ units = [
Expand All @@ -31,5 +31,5 @@ index b2cf9bd8f3..74d7f61519 100644
{
'file' : 'systemd-mute-console.socket',
--
2.53.0
2.54.0

Original file line number Diff line number Diff line change
Expand Up @@ -183,3 +183,5 @@ sys-apps/azure-vm-utils

# Keep versions on both arches in sync.
=sys-libs/libunwind-1.8.3

=sys-apps/systemd-261.2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DIST systemd-259.4.tar.gz 17336661 BLAKE2B 5e90410698e21e8fc8f5f22e3e26858f51d2cdfc362870f09ecccf8ed882602cdcef2614843738b14601349b05cfd3a8358a1771fc1fcd8e75d831940a8683c8 SHA512 bf572f92b0b01ecaf08f36ea5e13a2c05a79e6c0c2d9ef191855d1b83ae791a2977841ca85541ace1d30945d5f879d703d390767f708294986b29aeda1449b1f
DIST systemd-260.1.tar.gz 17581096 BLAKE2B 072424e7288f8796be1e6952fadc5452c2ab54633b356796a29872609a03b4cc2edbc0cac0df7542bc969b06d265d2cbf52f9174742c5a570a5a3d7a7664cfa8 SHA512 9f975dce6861853a817a7ceab18a24449a85d1bda6939b3a5173430c02a4d8a9a2b34ebb8cce1c51db9b0ff9078fcc65da7b0f44e3bdcbbe013b9e04bb6f0ff9
DIST systemd-260.2.tar.gz 17663337 BLAKE2B 6f19c9ab444d9bcd8d585a4c2ef5bf8763dcfcd69bbcc02659d8ebdbdebb97b25941fe38e6b7a5cc3046b7b724b14e3e94c1c95919314a30818c9f81143cb9e7 SHA512 63d15da49e7580952a48a0b50df20c1b398e4b77edf259510b0cdb9022e919387baadf2190194a50f1f582b83e0768c13997a4189cf0fb6a61b65015496d9c80
DIST systemd-261.1.tar.gz 18405830 BLAKE2B ab345d6ae27d361aa56d3b021263e2b2e3af76cdc37ee9015932557f1b904f2e5e5a6d5911b4a442057d12d5eedf8a702a30aa13f9b68294ccc14833f397a0ea SHA512 5dbf8b902fbed6e719367266da658b46ed55e76c93b7aa48ebaf9daca36cb19261ebd45cb97139c51227022a8ca3d07da360953bd9b0aebb429dce6d111f7e5c
DIST systemd-261.2.tar.gz 18456346 BLAKE2B f8f57c5e78ff31727ecfd18b61d3a3a95b764e5a049c0cc974be567273db2f771ab2f50df1ebf06b0c3a659c7e02db309dee4844217e3a91ae1169877971a34e SHA512 876f043970cb65b39ae15fba39f23bf94c7c3d80569503d6e8ea2c8013c30ee40ce43cb55cbcb1cf14d5c3021aafc09c0f67473bbf742d8964bf9fa30693b971
DIST systemd-261.tar.gz 18390754 BLAKE2B 3e307fa237911ee18e9dca2e3e26eac4859fe19bd856c970d9c557ed2a3420944a20affad60bf10dc4cada657778bac38a1a529fc0081ba255550bfd4c1a1f06 SHA512 6a21c2a9bd83d962db4e6c095078ec79259d8109583b59094d17e76c0826e96a6183778f46b64352b0fe62cb8890736e9331f35e9a4c8b65f9b574fa915f9fd8