SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26944 from aafeijoo-suse/systemd-network-generator-initrd-fix

Browse Source 
network-generator: do not parse kernel command line more than once
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-04-26 14:55:41 +02:00
committed by GitHub
parent 914f280d0c f3e4d04298
commit d21d71fb28
4 changed files with 80 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/generator/main.c
+43 -12
View File
@@ -4,6 +4,7 @@
#include "build.h"
#include "fd-util.h"
#include "fs-util.h"
#include "generator.h"
#include "macro.h"
#include "main-func.h"
@@ -17,67 +18,97 @@
static const char *arg_root = NULL;
static int network_save(Network *network, const char *dest_dir) {
_cleanup_free_ char *filename = NULL;
_cleanup_free_ char *filename = NULL, *p = NULL;
_cleanup_(unlink_and_freep) char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
assert(network);
r = generator_open_unit_file_full(dest_dir, NULL, NULL, &f, &temp_path);
if (r < 0)
return r;
network_dump(network, f);
r = asprintf(&filename, "%s-%s.network",
isempty(network->ifname) ? "91" : "90",
isempty(network->ifname) ? "default" : network->ifname);
if (r < 0)
return log_oom();
r = generator_open_unit_file(dest_dir, "kernel command line", filename, &f);
p = path_join(dest_dir, filename);
if (!p)
return log_oom();
r = conservative_rename(temp_path, p);
if (r < 0)
return r;
network_dump(network, f);
temp_path = mfree(temp_path);
return 0;
}
static int netdev_save(NetDev *netdev, const char *dest_dir) {
_cleanup_free_ char *filename = NULL;
_cleanup_free_ char *filename = NULL, *p = NULL;
_cleanup_(unlink_and_freep) char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
assert(netdev);
r = generator_open_unit_file_full(dest_dir, NULL, NULL, &f, &temp_path);
if (r < 0)
return r;
netdev_dump(netdev, f);
r = asprintf(&filename, "90-%s.netdev",
netdev->ifname);
if (r < 0)
return log_oom();
r = generator_open_unit_file(dest_dir, "kernel command line", filename, &f);
p = path_join(dest_dir, filename);
if (!p)
return log_oom();
r = conservative_rename(temp_path, p);
if (r < 0)
return r;
netdev_dump(netdev, f);
temp_path = mfree(temp_path);
return 0;
}
static int link_save(Link *link, const char *dest_dir) {
_cleanup_free_ char *filename = NULL;
_cleanup_free_ char *filename = NULL, *p = NULL;
_cleanup_(unlink_and_freep) char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
int r;
assert(link);
r = generator_open_unit_file_full(dest_dir, NULL, NULL, &f, &temp_path);
if (r < 0)
return r;
link_dump(link, f);
filename = strjoin(!isempty(link->ifname) ? "90" :
!hw_addr_is_null(&link->mac) ? "91" : "92",
"-", link->filename, ".link");
if (!filename)
return log_oom();
r = generator_open_unit_file(dest_dir, "kernel command line", filename, &f);
p = path_join(dest_dir, filename);
if (!p)
return log_oom();
r = conservative_rename(temp_path, p);
if (r < 0)
return r;
link_dump(link, f);
temp_path = mfree(temp_path);
return 0;
}