9cc0805afc
see http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git for now) - new commands: fallocate, unshare, wipefs - libblkid supports topology and partitions probing - remove support for --rmpart[s] from blockdev(8) (util-linux-ng-2.14-blockdev-rmpart.patch) - merged upstream: util-linux-ng-2.14-sfdisk-dump.patch util-linux-ng-2.16-blkid-swsuspend.patch util-linux-ng-2.16-libblkid-compression.patch util-linux-ng-2.16-libblkid-ext2.patch util-linux-ng-2.16-switchroot-tty.patch
75 lines
3.7 KiB
Diff
75 lines
3.7 KiB
Diff
diff -up util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.8
|
|
--- util-linux-ng-2.17-git5e51568/misc-utils/blkid.8.kzak 2009-10-16 22:50:03.000000000 +0200
|
|
+++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.8 2009-10-19 14:31:10.000000000 +0200
|
|
@@ -67,7 +67,7 @@ more devices.
|
|
Read from
|
|
.I cachefile
|
|
instead of reading from the default cache file
|
|
-.IR /etc/blkid.tab .
|
|
+.IR /etc/blkid/blkid.tab .
|
|
If you want to start with a clean cache (i.e. don't report devices previously
|
|
scanned but not necessarily available at this time), specify
|
|
.IR /dev/null .
|
|
@@ -190,7 +190,7 @@ Display version number and exit.
|
|
Write the device cache to
|
|
.I writecachefile
|
|
instead of writing it to the default cache file
|
|
-.IR /etc/blkid.tab .
|
|
+.IR /etc/blkid/blkid.tab .
|
|
If you don't want to save the cache to the default file, specify
|
|
.IR /dev/null.
|
|
If not specified it will be the same file as that given by the
|
|
diff -up util-linux-ng-2.17-git5e51568/misc-utils/blkid.c.kzak util-linux-ng-2.17-git5e51568/misc-utils/blkid.c
|
|
--- util-linux-ng-2.17-git5e51568/misc-utils/blkid.c.kzak 2009-10-16 22:50:03.000000000 +0200
|
|
+++ util-linux-ng-2.17-git5e51568/misc-utils/blkid.c 2009-10-19 14:31:10.000000000 +0200
|
|
@@ -62,7 +62,7 @@ static void usage(int error)
|
|
" [-t <token>] [-w <file>] [dev ...]\n\n"
|
|
" %1$s -p [-O <offset>] [-S <size>] [-o format] <dev> [dev ...]\n\n"
|
|
"Options:\n"
|
|
- " -c <file> cache file (default: /etc/blkid.tab, /dev/null = none)\n"
|
|
+ " -c <file> cache file (default: /etc/blkid/blkid.tab, /dev/null = none)\n"
|
|
" -h print this usage message and exit\n"
|
|
" -g garbage collect the blkid cache\n"
|
|
" -o <format> output format; can be one of:\n"
|
|
diff -up util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3
|
|
--- util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3.kzak 2009-10-16 22:50:03.000000000 +0200
|
|
+++ util-linux-ng-2.17-git5e51568/shlibs/blkid/libblkid.3 2009-10-19 14:31:10.000000000 +0200
|
|
@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
|
|
specific block device names into configuration files.
|
|
.P
|
|
Block device information is normally kept in a cache file
|
|
-.I /etc/blkid.tab
|
|
+.I /etc/blkid/blkid.tab
|
|
and is verified to still be valid before being returned to the user
|
|
(if the user has read permission on the raw block device, otherwise not).
|
|
The cache file also allows unprivileged users (normally anyone other
|
|
@@ -59,7 +59,7 @@ symlink does not match with LABEL or UUI
|
|
.I CACHE_FILE=<path>
|
|
Overrides the standard location of the cache file. This setting can be
|
|
overridden by the environment variable BLKID_FILE. Default is
|
|
-.I /etc/blkid.tab.
|
|
+.I /etc/blkid/blkid.tab.
|
|
.TP
|
|
.I EVALUATE=<methods>
|
|
Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
|
|
@@ -77,7 +77,7 @@ from Ted Ts'o. The library was subseque
|
|
The low-level probing code was rewritten by Karel Zak.
|
|
.SH FILES
|
|
.TP 18
|
|
-.I /etc/blkid.tab
|
|
+.I /etc/blkid/blkid.tab
|
|
caches data extracted from each recognized block device
|
|
.TP
|
|
.I /etc/blkid.conf
|
|
diff -up util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h
|
|
--- util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h.kzak 2009-10-16 22:50:03.000000000 +0200
|
|
+++ util-linux-ng-2.17-git5e51568/shlibs/blkid/src/blkidP.h 2009-10-19 14:32:03.000000000 +0200
|
|
@@ -267,7 +267,7 @@ extern char *blkid_strconcat(const char
|
|
extern int blkid_fstatat(DIR *dir, const char *dirname, const char *filename,
|
|
struct stat *st, int nofollow);
|
|
|
|
-#define BLKID_CACHE_FILE "/etc/blkid.tab"
|
|
+#define BLKID_CACHE_FILE "/etc/blkid/blkid.tab"
|
|
#define BLKID_CONFIG_FILE "/etc/blkid.conf"
|
|
|
|
#define BLKID_ERR_IO 5
|