chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtnl: drop "sd_" prefix from cleanup macros
[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 fa0d3f735e24efe0b6ca991689091646f23a7077..0336888b0207e63aaa4e61448f5c8aee9074e50d 100644
(file)
--- a/
src/fstab-generator/fstab-generator.c
+++ b/
src/fstab-generator/fstab-generator.c
@@
-152,6
+152,11
@@
static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
if (passno == 0)
return 0;
if (passno == 0)
return 0;
+ if (!is_device_path(what)) {
+ log_warning("Checking was requested for \"%s\", but it is not a device.", what);
+ return 0;
+ }
+
if (type && !streq(type, "auto")) {
int r;
const char *checker;
if (type && !streq(type, "auto")) {
int r;
const char *checker;
@@
-171,7
+176,7
@@
static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
lnk = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service");
mkdir_parents_label(lnk, 0755);
lnk = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service");
mkdir_parents_label(lnk, 0755);
- if (symlink(
"
systemd-fsck-root.service", lnk) < 0) {
+ if (symlink(
SYSTEM_DATA_UNIT_PATH "/
systemd-fsck-root.service", lnk) < 0) {
log_error("Failed to create symlink %s: %m", lnk);
return -errno;
}
log_error("Failed to create symlink %s: %m", lnk);
return -errno;
}
@@
-183,7
+188,7
@@
static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
return log_oom();
fprintf(f,
return log_oom();
fprintf(f,
- "Requires=%s\n"
+ "Requires
Overridable
=%s\n"
"After=%s\n",
fsck,
fsck);
"After=%s\n",
fsck,
fsck);