Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2011-11-08 17:54:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2011-11-02 12:19:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.util-linux.new/util-linux.changes 2011-11-08 17:54:50.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 8 09:36:41 UTC 2011 - [email protected] + +- add fsck-use-FS-blacklist-for-non-all-mode-too.patch (bnc#728645) + +------------------------------------------------------------------- New: ---- fsck-use-FS-blacklist-for-non-all-mode-too.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.FWiLbM/_old 2011-11-08 17:54:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FWiLbM/_new 2011-11-08 17:54:52.000000000 +0100 @@ -88,6 +88,7 @@ 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 @@ %patch2 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # cd adjtimex-* ++++++ fsck-use-FS-blacklist-for-non-all-mode-too.patch ++++++ >From e31741980762744352890d37522cbf4dd0ced9c4 Mon Sep 17 00:00:00 2001 From: Karel Zak <[email protected]> Date: Wed, 2 Nov 2011 15:51:45 +0100 Subject: [PATCH] fsck: use FS blacklist for non-all mode too Reported-by: Lennart Poettering <[email protected]> Signed-off-by: Karel Zak <[email protected]> Signed-off-by: Petr Uzel <[email protected]> --- 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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
