sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 90521 from Base:System

Browse Source 
Please, take this also to 12.1. Thanks.

add fsck-use-FS-blacklist-for-non-all-mode-too.patch (bnc#728645)

OBS-URL: https://build.opensuse.org/request/show/90521
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=137
This commit is contained in:
Stephan Kulow 2011-11-08 16:54:49 +00:00 committed by Git OBS Bridge
parent cac3f92aa1
commit 0c88c0aee9
3 changed files with 101 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
fsck-use-FS-blacklist-for-non-all-mode-too.patch Normal file
View File

@ -0,0 +1,94 @@
From e31741980762744352890d37522cbf4dd0ced9c4 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 2 Nov 2011 15:51:45 +0100
Subject: [PATCH] fsck: use FS blacklist for non-all mode too
Reported-by: Lennart Poettering <lennart@poettering.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
fsck/fsck.c | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
Index: util-linux-2.20.1/fsck/fsck.c
===================================================================
--- util-linux-2.20.1.orig/fsck/fsck.c
+++ util-linux-2.20.1/fsck/fsck.c
@@ -57,14 +57,35 @@
#include "xalloc.h"
static const char *ignored_types[] = {
+ "9p",
+ "afs",
+ "autofs",
+ "binfmt_misc",
+ "cgroup",
+ "cifs",
+ "cpuset",
+ "debugfs",
+ "devfs",
+ "devpts",
+ "devtmpfs",
+ "dlmfs",
+ "fusectl",
+ "fuse.gvfs-fuse-daemon",
+ "hugetlbfs",
"ignore",
"iso9660",
+ "mqueue"
+ "ncpfs",
"nfs",
"proc",
+ "rpc_pipefs",
+ "securityfs",
+ "smbfs",
+ "spufs",
"sw",
"swap",
+ "sysfs",
"tmpfs",
- "devpts",
NULL
};
@@ -953,6 +974,18 @@ static int device_exists(const char *dev
return 1;
}
+static int ignored_type(const char *fstype)
+{
+ const char **ip;
+
+ for(ip = ignored_types; *ip; ip++) {
+ if (strcmp(fstype, *ip) == 0)
+ return 1;
+ }
+
+ return 0;
+}
+
/* Check if we should ignore this filesystem. */
static int ignore(struct fs_info *fs)
{
@@ -1000,8 +1033,8 @@ static int ignore(struct fs_info *fs)
if (!fs_match(fs, &fs_type_compiled)) return 1;
/* Are we ignoring this type? */
- for(ip = ignored_types; *ip; ip++)
- if (strcmp(fs->type, *ip) == 0) return 1;
+ if (fs->type && ignored_type(fs->type))
+ return 1;
/* Do we really really want to check this fs? */
for(ip = really_wanted; *ip; ip++)
@@ -1461,7 +1494,9 @@ int main(int argc, char *argv[])
0, -1, -1);
if (!fs)
continue;
- }
+ } else if (fs->type && ignored_type(fs->type))
+ continue;
+
if (ignore_mounted && is_mounted(fs->device))
continue;
status |= fsck_device(fs, interactive);

5
util-linux.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 8 09:36:41 UTC 2011 - puzel@suse.com
- add fsck-use-FS-blacklist-for-non-all-mode-too.patch (bnc#728645)
-------------------------------------------------------------------
Wed Nov 2 09:37:12 UTC 2011 - puzel@suse.com

2
util-linux.spec
View File

@ -88,6 +88,7 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
Patch2: util-linux-2.17.1-mount_losetup_crypto.patch
Patch5: util-linux-2.20-libmount-deps.patch
Patch6: util-linux-dmesg-fix-printing-of-multibyte-characters.patch
Patch7: fsck-use-FS-blacklist-for-non-all-mode-too.patch
##
## adjtimex
@ -191,6 +192,7 @@ Files to develop applications using the libmount library.
%patch2 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
#
cd adjtimex-*