fsck: warn if fsck.<type> not found and device is specified

The fsck(8) command prints an error for certain 'required'
filesystems, such as extN, if the corresponding fsck.<type> helper is
not found. However, for other filesystems, it silently ignores the
device. While this behavior is acceptable for the -A option, if a user
explicitly specifies the device on the command line, it is probably a
good idea to be more verbose and issue a warning that the device will
be ignored. The warning is enabled only for interactive mode (only one
device specified or -s).

Note that some filesystems do not have an fsck utility, so caution is
needed when issuing such warnings to prevent the generation of a large
number of unwanted entries in system logs, etc."

Reported-by: наб <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index c63ce1c23ac534faadde9caf08a8a75e6892cbf6..7dc12e67ade090dd0958a00c4f50da295d3b827e 100644 (file)
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -902,7 +902,7 @@ static int wait_many(int flags)
  * If the type isn't specified by the user, then use either the type
  * specified in /etc/fstab, or DEFAULT_FSTYPE.
  */
-static int fsck_device(struct libmnt_fs *fs, int interactive)
+static int fsck_device(struct libmnt_fs *fs, int interactive, int warn_notfound)
 {
        char *progname, *progpath;
        const char *type;
@@ -929,6 +929,9 @@ static int fsck_device(struct libmnt_fs *fs, int interactive)
                        retval = ENOENT;
                        goto err;
                }
+               if (warn_notfound)
+                       warnx(_("fsck.%s not found; ignore %s"), type,
+                                       fs_get_device(fs));
                return 0;
        }
 
@@ -1287,7 +1290,7 @@ static int check_all(void)
                        if (!skip_root &&
                            !fs_is_done(fs) &&
                            !(ignore_mounted && is_mounted(fs))) {
-                               status |= fsck_device(fs, 1);
+                               status |= fsck_device(fs, 1, 0);
                                status |= wait_many(FLAG_WAIT_ALL);
                                if (status > FSCK_EX_NONDESTRUCT) {
                                        mnt_free_iter(itr);
@@ -1350,7 +1353,7 @@ static int check_all(void)
                        /*
                         * Spawn off the fsck process
                         */
-                       status |= fsck_device(fs, serialize);
+                       status |= fsck_device(fs, serialize, 0);
                        fs_set_done(fs);
 
                        /*
@@ -1688,7 +1691,7 @@ int main(int argc, char *argv[])
                        continue;
                if (ignore_mounted && is_mounted(fs))
                        continue;
-               status |= fsck_device(fs, interactive);
+               status |= fsck_device(fs, interactive, interactive);
                if (serialize ||
                    (max_running && (num_running >= max_running))) {
                        struct fsck_instance *inst;