shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

gpt-auto-generator: pull in systemd-growfs@.service if new GPT growfs partition flag is set

Browse Source
This commit is contained in:
Lennart Poettering 2021-04-21 18:30:06 +02:00
parent 66e482cbdb
commit 400c1e8f98
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gpt-auto-generator/gpt-auto-generator.c
View File

@ -194,6 +194,7 @@ static int add_mount(
const char *where,
const char *fstype,
bool rw,
bool growfs,
const char *options,
const char *description,
const char *post) {
@ -271,8 +272,18 @@ static int add_mount(
if (r < 0)
return log_error_errno(r, "Failed to write unit file %s: %m", p);
if (post)
return generator_add_symlink(arg_dest, post, "requires", unit);
if (growfs) {
r = generator_hook_up_growfs(arg_dest, where, post);
if (r < 0)
return r;
}
if (post) {
r = generator_add_symlink(arg_dest, post, "requires", unit);
if (r < 0)
return r;
}
return 0;
}
@ -321,6 +332,7 @@ static int add_partition_mount(
where,
p->fstype,
p->rw,
p->growfs,
NULL,
description,
SPECIAL_LOCAL_FS_TARGET);
@ -385,6 +397,7 @@ static int add_automount(
const char *where,
const char *fstype,
bool rw,
bool growfs,
const char *options,
const char *description,
usec_t timeout) {
@ -406,6 +419,7 @@ static int add_automount(
where,
fstype,
rw,
growfs,
opt,
description,
NULL);
@ -481,7 +495,8 @@ static int add_xbootldr(DissectedPartition *p) {
p->node,
"/boot",
p->fstype,
true,
/* rw= */ true,
/* growfs= */ false,
esp_or_xbootldr_options(p),
"Boot Loader Partition",
120 * USEC_PER_SEC);
@ -555,7 +570,8 @@ static int add_esp(DissectedPartition *p, bool has_xbootldr) {
p->node,
esp_path,
p->fstype,
true,
/* rw= */ true,
/* growfs= */ false,
esp_or_xbootldr_options(p),
"EFI System Partition Automount",
120 * USEC_PER_SEC);
@ -651,7 +667,8 @@ static int add_root_mount(void) {
"/dev/gpt-auto-root",
in_initrd() ? "/sysroot" : "/",
NULL,
arg_root_rw > 0,
/* rw= */ arg_root_rw > 0,
/* growfs= */ false,
NULL,
"Root Partition",
in_initrd() ? SPECIAL_INITRD_ROOT_FS_TARGET : SPECIAL_LOCAL_FS_TARGET);

8
src/shared/generator.c
View File

@ -503,6 +503,9 @@ int generator_hook_up_growfs(
const char *unit_file;
int r;
assert(dir);
assert(where);
escaped = cescape(where);
if (!escaped)
return log_oom();
@ -534,9 +537,10 @@ int generator_hook_up_growfs(
"BindsTo=%%i.mount\n"
"Conflicts=shutdown.target\n"
"After=%%i.mount\n"
"Before=shutdown.target %s\n",
"Before=shutdown.target%s%s\n",
program_invocation_short_name,
target);
target ? " " : "",
strempty(target));
if (empty_or_root(where)) /* Make sure the root fs is actually writable before we resize it */
fprintf(f,