diff --git a/libblkid-make-backup-superblock-visible-for-wipefs-8.patch b/libblkid-make-backup-superblock-visible-for-wipefs-8.patch index 2ec5060..df06674 100644 --- a/libblkid-make-backup-superblock-visible-for-wipefs-8.patch +++ b/libblkid-make-backup-superblock-visible-for-wipefs-8.patch @@ -1,6 +1,6 @@ diff -up util-linux-2.22.2/libblkid/src/blkidP.h.kzak util-linux-2.22.2/libblkid/src/blkidP.h --- util-linux-2.22.2/libblkid/src/blkidP.h.kzak 2012-12-12 21:04:47.902355093 +0100 -+++ util-linux-2.22.2/libblkid/src/blkidP.h 2013-02-19 16:07:56.792389574 +0100 ++++ util-linux-2.22.2/libblkid/src/blkidP.h 2013-02-20 10:54:33.885606609 +0100 @@ -224,6 +224,9 @@ struct blkid_struct_probe /* private per-probing flags */ @@ -13,8 +13,24 @@ diff -up util-linux-2.22.2/libblkid/src/blkidP.h.kzak util-linux-2.22.2/libblkid extern blkid_probe blkid_probe_get_wholedisk_probe(blkid_probe pr); diff -up util-linux-2.22.2/libblkid/src/probe.c.kzak util-linux-2.22.2/libblkid/src/probe.c --- util-linux-2.22.2/libblkid/src/probe.c.kzak 2012-12-12 21:04:47.903355101 +0100 -+++ util-linux-2.22.2/libblkid/src/probe.c 2013-02-19 16:07:56.793389584 +0100 -@@ -1111,6 +1111,8 @@ int blkid_do_fullprobe(blkid_probe pr) ++++ util-linux-2.22.2/libblkid/src/probe.c 2013-02-20 11:02:48.525255696 +0100 +@@ -810,6 +810,7 @@ int blkid_probe_get_idmag(blkid_probe pr + static inline void blkid_probe_start(blkid_probe pr) + { + if (pr) { ++ DBG(DEBUG_LOWPROBE, printf("%p: start probe\n", pr)); + pr->cur_chain = NULL; + pr->prob_flags = 0; + blkid_probe_set_wiper(pr, 0, 0); +@@ -819,6 +820,7 @@ static inline void blkid_probe_start(blk + static inline void blkid_probe_end(blkid_probe pr) + { + if (pr) { ++ DBG(DEBUG_LOWPROBE, printf("%p: end probe\n", pr)); + pr->cur_chain = NULL; + pr->prob_flags = 0; + blkid_probe_set_wiper(pr, 0, 0); +@@ -1057,6 +1059,8 @@ int blkid_do_safeprobe(blkid_probe pr) blkid_probe_start(pr); @@ -23,7 +39,7 @@ diff -up util-linux-2.22.2/libblkid/src/probe.c.kzak util-linux-2.22.2/libblkid/ for (i = 0; i < BLKID_NCHAINS; i++) { struct blkid_chain *chn; -@@ -1679,3 +1681,7 @@ void blkid_probe_use_wiper(blkid_probe p +@@ -1679,3 +1683,7 @@ void blkid_probe_use_wiper(blkid_probe p } } @@ -32,14 +48,16 @@ diff -up util-linux-2.22.2/libblkid/src/probe.c.kzak util-linux-2.22.2/libblkid/ + return pr && (pr->prob_flags & BLKID_PROBE_FL_IGNORE_BACKUP); +} diff -up util-linux-2.22.2/libblkid/src/superblocks/btrfs.c.kzak util-linux-2.22.2/libblkid/src/superblocks/btrfs.c ---- util-linux-2.22.2/libblkid/src/superblocks/btrfs.c.kzak 2013-02-19 16:06:56.942965043 +0100 -+++ util-linux-2.22.2/libblkid/src/superblocks/btrfs.c 2013-02-19 16:07:56.793389584 +0100 -@@ -63,6 +63,9 @@ static int probe_btrfs(blkid_probe pr, c +--- util-linux-2.22.2/libblkid/src/superblocks/btrfs.c.kzak 2013-02-20 10:54:03.422381876 +0100 ++++ util-linux-2.22.2/libblkid/src/superblocks/btrfs.c 2013-02-20 10:54:33.886606616 +0100 +@@ -63,6 +63,11 @@ static int probe_btrfs(blkid_probe pr, c { struct btrfs_super_block *bfs; -+ if (mag->kboff > 64 && blkid_probe_ignore_backup(pr)) ++ if (mag->kboff > 64 && blkid_probe_ignore_backup(pr)) { ++ DBG(DEBUG_LOWPROBE, printf("btrfs: found backup superblock, ignore\n")); + return 1; ++ } + bfs = blkid_probe_get_sb(pr, mag, struct btrfs_super_block); if (!bfs) diff --git a/util-linux.spec b/util-linux.spec index 799e4d1..02bd2a8 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.22.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux @@ -739,6 +739,9 @@ fi %{_libdir}/pkgconfig/uuid.pc %changelog +* Wed Feb 20 2013 Karel Zak 2.22.2-6 +- fix patch for #902512 + * Tue Feb 19 2013 Karel Zak 2.22.2-5 - fix #902512 - Dependency failed for /home (and blkid fails to tell UUID) - refresh old patches