summaryrefslogtreecommitdiff
path: root/src/fstab-generator
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-05-23 03:43:29 +0200
committerLennart Poettering <lennart@poettering.net>2012-05-23 03:43:29 +0200
commit07719a21b6425d378b36bb8d7f47ad5ec5296d28 (patch)
tree5195e8b0dd74a415f0d048398b8b1d25e9112e04 /src/fstab-generator
parent7c4c5f68a5dd55f33bf18ccccbc8a611703fc3e2 (diff)
manager: rework generator logic
Previously generated units were always placed at the end of the search path. With this change there will be three unit dirs instead of one, to place generated entries at the beginning, in the middle and at the end of the search path: beginning: for units that need to override all configuration, regardless of user or vendor. Example use: system-update-generator uses this to temporarily redirect default.target. middle: for units that need to override vendor configuration, but not vendor configuration. Example use: /etc/fstab should override vendor supplied configuration (think /tmp), but should not override native user configuration. end: does not override anything but is available as well. Possible usage might be to convert D-Bus bus service files to native units but allowing vendor supplied native units to win.
Diffstat (limited to 'src/fstab-generator')
-rw-r--r--src/fstab-generator/fstab-generator.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 8a519fcfd9..8676a20539 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -498,8 +498,8 @@ finish:
int main(int argc, char *argv[]) {
int r;
- if (argc > 2) {
- log_error("This program takes one or no arguments.");
+ if (argc > 1 && argc != 4) {
+ log_error("This program takes three or no arguments.");
return EXIT_FAILURE;
}
@@ -510,8 +510,6 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
- log_set_max_level(LOG_DEBUG);
-
umask(0022);
r = parse_fstab();