morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fstab-generator: read both credentials in initrd

Browse Source 
This makes the behavior consistent with the way we already do for
fstab and command line options.
In initrd, entries read from fstab.extra are mounted under /sysroot.
This commit is contained in:
Yu Watanabe
2023-07-26 04:25:57 +09:00
parent 45c535ddb0
commit dfd10549ac
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/fstab-generator/fstab-generator.c
View File

@@ -1309,14 +1309,16 @@ static int add_mounts_from_cmdline(void) {
return ret;
}
static int add_mounts_from_creds(void) {
static int add_mounts_from_creds(bool prefix_sysroot) {
_cleanup_free_ void *b = NULL;
struct mntent *me;
int r, ret = 0;
size_t bs;
assert(in_initrd() || !prefix_sysroot);
r = read_credential_with_decryption(
in_initrd() ? "fstab.extra.initrd" : "fstab.extra",
in_initrd() && !prefix_sysroot ? "fstab.extra.initrd" : "fstab.extra",
&b, &bs);
if (r <= 0)
return r;
@@ -1334,7 +1336,7 @@ static int add_mounts_from_creds(void) {
me->mnt_type,
me->mnt_opts,
me->mnt_passno,
/* prefix_sysroot = */ false,
/* prefix_sysroot = */ prefix_sysroot,
/* use_swap_enabled = */ true);
if (r < 0 && ret >= 0)
ret = r;
@@ -1575,10 +1577,16 @@ static int run_generator(void) {
if (r < 0 && ret >= 0)
ret = r;
r = add_mounts_from_creds();
r = add_mounts_from_creds(/* prefix_sysroot = */ false);
if (r < 0 && ret >= 0)
ret = r;
if (in_initrd()) {
r = add_mounts_from_creds(/* prefix_sysroot = */ true);
if (r < 0 && ret >= 0)
ret = r;
}
return ret;
}