chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: rework generator logic
[elogind.git]
/
src
/
fstab-generator
/
fstab-generator.c
diff --git
a/src/fstab-generator/fstab-generator.c
b/src/fstab-generator/fstab-generator.c
index 86cbc45b78d1738db2ff3b2030389e35b2fd45c3..8676a20539c5c10596920c023e0914f7a3237030 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-117,6
+117,7
@@
static int add_swap(const char *what, struct mntent *me) {
fputs("# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
fputs("# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
+ "SourcePath=/etc/fstab\n"
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET "\n", f);
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET "\n", f);
@@
-274,6
+275,7
@@
static int add_mount(const char *what, const char *where, struct mntent *me) {
fputs("# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
fputs("# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
+ "SourcePath=/etc/fstab\n"
"DefaultDependencies=no\n", f);
if (!path_equal(where, "/"))
"DefaultDependencies=no\n", f);
if (!path_equal(where, "/"))
@@
-386,6
+388,7
@@
static int add_mount(const char *what, const char *where, struct mntent *me) {
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
fprintf(f,
"# Automatically generated by systemd-fstab-generator\n\n"
"[Unit]\n"
+ "SourcePath=/etc/fstab\n"
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET " %s\n"
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET " %s\n"
@@
-495,8
+498,8
@@
finish:
int main(int argc, char *argv[]) {
int r;
int main(int argc, char *argv[]) {
int r;
- if (argc >
2
) {
- log_error("This program takes
on
e or no arguments.");
+ if (argc >
1 && argc != 4
) {
+ log_error("This program takes
thre
e or no arguments.");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-507,8
+510,6
@@
int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
log_parse_environment();
log_open();
- log_set_max_level(LOG_DEBUG);
-
umask(0022);
r = parse_fstab();
umask(0022);
r = parse_fstab();