vol_id: update README

2 files changed, 25 insertions, 38 deletions

diff --git a/configure.ac b/configure.ac
index 0e0f9875a9..6e98f37fba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_PROG_LIBTOOL
 
 dnl /* libudev version */
 LIBUDEV_LT_CURRENT=0
-LIBUDEV_LT_REVISION=2
+LIBUDEV_LT_REVISION=3
 LIBUDEV_LT_AGE=0
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)
@@ -19,7 +19,7 @@ AC_SUBST(LIBUDEV_LT_AGE)
 
 dnl /* libvolume_id version */
 VOLID_LT_CURRENT=1
-VOLID_LT_REVISION=2
+VOLID_LT_REVISION=3
 VOLID_LT_AGE=0
 AC_SUBST(VOLID_LT_CURRENT)
 AC_SUBST(VOLID_LT_REVISION)
diff --git a/extras/volume_id/README b/extras/volume_id/README
index 44a9a875f3..9459c880f8 100644
--- a/extras/volume_id/README
+++ b/extras/volume_id/README
@@ -1,25 +1,31 @@
 vol_id - probe filesystem and read label and uuid
 
-This program is normally called from a udev rule, to provide udev with the
-filesystem type of a volume and the label and uuid to name a device node.
-vol_id opens the blockdevice node specified at the commandline. The following
-commandline switches are supported to specify what vol_id should print:
-  --export        export key/value pairs
-  --type          filesystem type
-  --label         filesystem label
-  --label-raw     raw label
-  --uuid          filesystem uuid
-  --skip-raid     don't probe for raid
-  --probe-all     find possibly conflicting signatures
-  --help
+vol_id will only return with a non-zero exit code if the string asked for,
+is not empty. All trailing whitespace will be removed, spaces replaced by
+underscore and slashes ignored.
+Unmangled values are available in the --export mode as hex-encoded strings
+in *_ENC= keys.
+
+  $ extras/volume_id/vol_id --export /dev/sda6
+  ID_FS_USAGE=filesystem
+  ID_FS_TYPE=ext3
+  ID_FS_VERSION=1.0
+  ID_FS_UUID=3e999973-00c9-4917-9442-b7633bd95b9e
+  ID_FS_UUID_ENC=3e999973-00c9-4917-9442-b7633bd95b9e
+  ID_FS_LABEL=devel
+  ID_FS_LABEL_ENC=devel
+
+  $ extras/volume_id/vol_id --label /dev/sda6
+  devel
+
+  $ extras/volume_id/vol_id --type /dev/sda6
+  ext3
 
-vol_id will only return successful if the string asked for, is not
-empty. All trailing whitespace will be removed, spaces replaced by underscore
-and slashes ignored.
 
 fstype                 probe  label  uuid  version
 --------------------------------------------------
 linux swap             *      *      *     *
+btrfs                  *      *      *     -
 ext                    *      *      *     *
 reiserfs jr/3.5/3.6/4  *      *      *     *
 fat (12, 16, 32)       *      *      *     *
@@ -33,13 +39,13 @@ ufs                    *      -      -     -
 cramfs                 *      *      -     -
 sysv                   *      *      -     *
 luks                   *      -      *     -
-hpfs                   *      -      -     -
+hpfs                   *      *      -     -
 romfs                  *      *      -     -
 squashfs               *      -      -     -
 minix                  *      -      -     *
 ocfs (1, 2)            *      *      *     *
 vxfs                   *      -      -     *
-nss (netware)          *             *     *
+nss (netware)          *      -      *     *
 gfs, gfs2              *      *      *     -
 oracleasm              *      *      -     -
 
@@ -58,22 +64,3 @@ silicon_raid           *      -      -     -
 via_raid               *      -      -     -
 jmicron                *      -      -     -
 adaptec                *      -      -     -
-
-To give it a try, you may call it on the commandline:
-  $ extras/volume_id/vol_id --export /dev/sda6
-  ID_FS_USAGE=filesystem
-  ID_FS_TYPE=ext3
-  ID_FS_VERSION=1.0
-  ID_FS_UUID=3e999973-00c9-4917-9442-b7633bd95b9e
-  ID_FS_LABEL=devel
-  ID_FS_LABEL_SAFE=devel
-
-  $ extras/volume_id/vol_id --label /dev/sda6
-  devel
-
-  $ extras/volume_id/vol_id --type /dev/sda6
-  ext3
-
-
-Any comment/questions/concerns to me:
-  Kay Sievers <kay.sievers@vrfy.org>