ea71a49292
Resolves: #2161260,#2170883,#2178222,#2190226,#2209912,#2211065,#2213521,#2226980,#2230364,#2231845
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From 25d1a4f55fec8713995eadd8f1830365f872a201 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Fri, 23 Jun 2023 22:49:55 +0200
|
|
Subject: [PATCH] fstab-generator: add more parameter name comments
|
|
|
|
(cherry picked from commit 3a065dfc29aa061906ab9dd886093581410b666a)
|
|
|
|
Related: #2190226
|
|
---
|
|
src/fstab-generator/fstab-generator.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
|
|
index b92fb40f9b..e403a4c096 100644
|
|
--- a/src/fstab-generator/fstab-generator.c
|
|
+++ b/src/fstab-generator/fstab-generator.c
|
|
@@ -1425,7 +1425,7 @@ static int run_generator(void) {
|
|
(void) determine_usr();
|
|
|
|
if (arg_sysroot_check) {
|
|
- r = parse_fstab(true);
|
|
+ r = parse_fstab(/* initrd= */ true);
|
|
if (r == 0)
|
|
log_debug("Nothing interesting found, not doing daemon-reload.");
|
|
if (r > 0)
|
|
@@ -1455,13 +1455,13 @@ static int run_generator(void) {
|
|
/* Honour /etc/fstab only when that's enabled */
|
|
if (arg_fstab_enabled) {
|
|
/* Parse the local /etc/fstab, possibly from the initrd */
|
|
- r = parse_fstab(false);
|
|
+ r = parse_fstab(/* initrd= */ false);
|
|
if (r < 0 && ret >= 0)
|
|
ret = r;
|
|
|
|
/* If running in the initrd also parse the /etc/fstab from the host */
|
|
if (in_initrd())
|
|
- r = parse_fstab(true);
|
|
+ r = parse_fstab(/* initrd= */ true);
|
|
else
|
|
r = generator_enable_remount_fs_service(arg_dest);
|
|
if (r < 0 && ret >= 0)
|