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

Merge pull request #29007 from tormath1/tormath1/reload

Browse Source 
sysext: fix around `--root` support
This commit is contained in:
Mike Yuan
2023-08-30 00:39:30 +08:00
committed by GitHub
parent 8fcc700bd9 6a69b0d6d8
commit acf565b499
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysext/sysext.c
+4 -2
View File
@@ -180,7 +180,7 @@ static int need_reload(void) {
if (!r)
continue;
f = path_join(*p, image_class_info[arg_image_class].dot_directory_name, image_class_info[arg_image_class].short_identifier_plural);
f = path_join(resolved, image_class_info[arg_image_class].dot_directory_name, image_class_info[arg_image_class].short_identifier_plural);
if (!f)
return log_oom();
@@ -348,7 +348,7 @@ static int verb_status(int argc, char **argv, void *userdata) {
continue;
}
f = path_join(*p, image_class_info[arg_image_class].dot_directory_name, image_class_info[arg_image_class].short_identifier_plural);
f = path_join(resolved, image_class_info[arg_image_class].dot_directory_name, image_class_info[arg_image_class].short_identifier_plural);
if (!f)
return log_oom();
@@ -1138,6 +1138,8 @@ static int parse_argv(int argc, char *argv[]) {
r = parse_path_argument(optarg, false, &arg_root);
if (r < 0)
return r;
/* If --root= is provided, do not reload the service manager */
arg_no_reload = true;
break;
case ARG_JSON: