generator: also suppress fsck early if we are adding a bind mount
There's no point in "fscking a bind mount". Let's not do it hence.
This commit is contained in:
@@ -605,7 +605,7 @@ static int add_mount(
|
||||
fprintf(f, "After=%s\n", extra_after);
|
||||
|
||||
if (passno != 0) {
|
||||
r = generator_write_fsck_deps(f, dest, what, where, fstype);
|
||||
r = generator_write_fsck_deps(f, dest, what, where, fstype, opts);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
@@ -245,7 +245,7 @@ static int add_mount(
|
||||
if (post)
|
||||
fprintf(f, "Before=%s\n", post);
|
||||
|
||||
r = generator_write_fsck_deps(f, arg_dest, what, where, fstype);
|
||||
r = generator_write_fsck_deps(f, arg_dest, what, where, fstype, opts_filtered);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
||||
@@ -270,7 +270,8 @@ int generator_write_fsck_deps(
|
||||
const char *dir,
|
||||
const char *what,
|
||||
const char *where,
|
||||
const char *fstype) {
|
||||
const char *fstype,
|
||||
const char *options) {
|
||||
|
||||
int r;
|
||||
|
||||
@@ -298,6 +299,11 @@ int generator_write_fsck_deps(
|
||||
}
|
||||
}
|
||||
|
||||
if (fstab_test_option(options, "bind\0rbind\0")) {
|
||||
log_debug("Skipping file system check for bind mount of '%s'.", what);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!is_device_path(what)) {
|
||||
log_warning("Checking was requested for \"%s\", but it is not a device.", what);
|
||||
return 0;
|
||||
|
||||
@@ -22,7 +22,8 @@ int generator_write_fsck_deps(
|
||||
const char *dir,
|
||||
const char *what,
|
||||
const char *where,
|
||||
const char *type);
|
||||
const char *type,
|
||||
const char *options);
|
||||
|
||||
int generator_write_device_timeout(
|
||||
const char *dir,
|
||||
|
||||
Reference in New Issue
Block a user