diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-08-09 02:18:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 02:18:13 +0200 |
| commit | bcb299e461a1d0b58e1cac26e28e6f22b3e1115f (patch) | |
| tree | 95443158539ad736cc6db85bd071a7d0125b5076 /src/fstab-generator | |
| parent | meson: use install_emptydir() and drop meson-make-symlink.sh (diff) | |
| parent | tree-wise: drop unnecessary use of proc_cmdline_key_streq() (diff) | |
| download | systemd-bcb299e461a1d0b58e1cac26e28e6f22b3e1115f.tar.xz systemd-bcb299e461a1d0b58e1cac26e28e6f22b3e1115f.zip | |
Merge pull request #28727 from yuwata/proc-cmdline-cleanups
tree-wide: fixlet and optimization for parsing kernel command line
Diffstat (limited to 'src/fstab-generator')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 041789673f..c88f5d4b47 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -1355,6 +1355,8 @@ static int add_mounts_from_creds(bool prefix_sysroot) { static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { int r; + assert(key); + /* root=, usr=, usrfstype= and roofstype= may occur more than once, the last * instance should take precedence. In the case of multiple rootflags= * or usrflags= the arguments should be concatenated */ |