From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 24 Oct 2023 09:13:08 +0000 (+0900)
Subject: network: do not try to save link state file twice on boot
X-Git-Tag: v255-rc1~149^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac4a69500e730f4a9a08143a08a2b2851cf8ecb5;p=thirdparty%2Fsystemd.git

network: do not try to save link state file twice on boot

On enumeration, (that is, before manager_start() is called), enumerated
links may already have the dirty flag. In that case, saving the state
file in manager_start() should clear the flag.
---

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index f597eb358b7..e02d0992b41 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -692,7 +692,7 @@ int manager_start(Manager *m) {
                 log_warning_errno(r, "Failed to update state file %s, ignoring: %m", m->state_file);
 
         HASHMAP_FOREACH(link, m->links_by_index) {
-                r = link_save(link);
+                r = link_save_and_clean(link);
                 if (r < 0)
                         log_link_warning_errno(link, r, "Failed to update link state file %s, ignoring: %m", link->state_file);
         }