shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-08-25 13:49:55 +03:00
Code Activity

generator: run various generators only run on the host, not in initrd

Browse Source 
These 5 generators only make sense on the host,not in the initrd, hence
if they end up in the initrd anyway, make them exit quickly.
This commit is contained in:
Lennart Poettering
2023-06-30 10:23:10 +02:00
parent 53888c3393
commit 3ed075cf61
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/boot/bless-boot-generator.c
View File

@ -18,9 +18,9 @@
static int run(const char *dest, const char *dest_early, const char *dest_late) {
if (in_initrd() > 0) {
if (in_initrd()) {
log_debug("Skipping generator, running in the initrd.");
return 0;
return EXIT_SUCCESS;
}
if (detect_container() > 0) {

6
src/getty-generator/getty-generator.c
View File

@ -10,6 +10,7 @@
#include "fd-util.h"
#include "fileio.h"
#include "generator.h"
#include "initrd-util.h"
#include "log.h"
#include "mkdir-label.h"
#include "parse-util.h"
@ -212,6 +213,11 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
assert_se(arg_dest = dest);
if (in_initrd()) {
log_debug("Skipping generator, running in the initrd.");
return EXIT_SUCCESS;
}
r = proc_cmdline_parse(parse_proc_cmdline_item, NULL, 0);
if (r < 0)
log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");

6
src/rc-local-generator/rc-local-generator.c
View File

@ -5,6 +5,7 @@
#include <unistd.h>
#include "generator.h"
#include "initrd-util.h"
#include "log.h"
#include "mkdir-label.h"
#include "string-util.h"
@ -58,6 +59,11 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
assert_se(arg_dest = dest);
if (in_initrd()) {
log_debug("Skipping generator, running in the initrd.");
return EXIT_SUCCESS;
}
if (check_executable(RC_LOCAL_PATH) >= 0) {
log_debug("Automatically adding rc-local.service.");

6
src/system-update-generator/system-update-generator.c
View File

@ -5,6 +5,7 @@
#include "fs-util.h"
#include "generator.h"
#include "initrd-util.h"
#include "log.h"
#include "path-util.h"
#include "proc-cmdline.h"
@ -61,6 +62,11 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
assert_se(arg_dest = dest_early);
if (in_initrd()) {
log_debug("Skipping generator, running in the initrd.");
return EXIT_SUCCESS;
}
r = generate_symlink();
if (r <= 0)
return r;

6
src/sysv-generator/sysv-generator.c
View File

@ -14,6 +14,7 @@
#include "generator.h"
#include "hashmap.h"
#include "hexdecoct.h"
#include "initrd-util.h"
#include "install.h"
#include "log.h"
#include "main-func.h"
@ -899,6 +900,11 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
SysvStub *service;
int r;
if (in_initrd()) {
log_debug("Skipping generator, running in the initrd.");
return EXIT_SUCCESS;
}
assert_se(arg_dest = dest_late);
r = lookup_paths_init_or_warn(&lp, RUNTIME_SCOPE_SYSTEM, LOOKUP_PATHS_EXCLUDE_GENERATED, NULL);