Blame 0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch
|
 |
a52f674 |
From 6b838ee990970947770ea7458b036d4cd1af5a09 Mon Sep 17 00:00:00 2001
|
|
|
b12ff75 |
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
|
|
|
b12ff75 |
Date: Sat, 21 Dec 2013 11:22:37 +0100
|
|
|
b12ff75 |
Subject: [PATCH] fstab-generator: Do not try to fsck non-devices
|
|
|
b12ff75 |
|
|
|
b12ff75 |
This fixes a regression introduced in 64e70e4 where the mount fails
|
|
|
b12ff75 |
when fstab is misconfigured with fs_passno > 0 on a virtual file
|
|
|
b12ff75 |
system like nfs, and the type is specified as "auto".
|
|
|
a52f674 |
|
|
|
a52f674 |
(cherry picked from commit e2f123b97b9af34f39cb18ce0c1c5ef6cb89117e)
|
|
|
b12ff75 |
---
|
|
|
b12ff75 |
src/fstab-generator/fstab-generator.c | 5 +++++
|
|
|
b12ff75 |
1 file changed, 5 insertions(+)
|
|
|
b12ff75 |
|
|
|
b12ff75 |
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
|
|
|
b12ff75 |
index 4137796..8c4c61c 100644
|
|
|
b12ff75 |
--- a/src/fstab-generator/fstab-generator.c
|
|
|
b12ff75 |
+++ b/src/fstab-generator/fstab-generator.c
|
|
|
b12ff75 |
@@ -153,6 +153,11 @@ static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
|
|
|
b12ff75 |
if (passno == 0)
|
|
|
b12ff75 |
return 0;
|
|
|
b12ff75 |
|
|
|
b12ff75 |
+ if (!is_device_path(what)) {
|
|
|
b12ff75 |
+ log_warning("Checking was requested for \"%s\", but it is not a device.", what);
|
|
|
b12ff75 |
+ return 0;
|
|
|
b12ff75 |
+ }
|
|
|
b12ff75 |
+
|
|
|
b12ff75 |
if (type && !streq(type, "auto")) {
|
|
|
b12ff75 |
int r;
|
|
|
b12ff75 |
const char *checker;
|