From 2e8522767e27d5686206794c69e0aa95da6e798b Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 2 May 2015 12:01:29 -0500 Subject: generators: rename add_{root,usr}_mount to add_{sysroot,sysroot_usr}_mount This makes it obvious that those functions are only usable in the initramfs. Also, add a warning when noauto, nofail, or automount is used for the root fs, instead of silently ignoring. Using those options would be a sign of significant misconfiguration, and if we bother to check for them, than let's go all the way and complain. Other various small cleanups and reformattings elsewhere. --- src/shared/generator.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/shared/generator.h') diff --git a/src/shared/generator.h b/src/shared/generator.h index 64bd28f596..6c3f38abba 100644 --- a/src/shared/generator.h +++ b/src/shared/generator.h @@ -23,7 +23,16 @@ #include -int generator_write_fsck_deps(FILE *f, const char *dest, const char *what, const char *where, const char *type); - -int generator_write_timeouts(const char *dir, const char *what, const char *where, - const char *opts, char **filtered); +int generator_write_fsck_deps( + FILE *f, + const char *dir, + const char *what, + const char *where, + const char *type); + +int generator_write_timeouts( + const char *dir, + const char *what, + const char *where, + const char *opts, + char **filtered); -- cgit v1.2.3-54-g00ecf