From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 4 May 2007 15:16:08 +0000 (+0200)
Subject: vol_id: README update
X-Git-Tag: 174~1964
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=68d557885247632558e8c14ffc4b16e916810bee;hp=a6abdbfc7e216e5c84009fabbc8cff99a880485d

vol_id: README update
---

diff --git a/extras/volume_id/README b/extras/volume_id/README
index b458ca59b..217be3114 100644
--- a/extras/volume_id/README
+++ b/extras/volume_id/README
@@ -4,18 +4,21 @@ 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 prints all values
-  -h       prints help text
-  -l       prints the label of the volume
-  -u       prints the uuid of the volume
+  --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 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  fsversion
-----------------------------------------------------
+fstype                 probe  label  uuid  version
+--------------------------------------------------
 linux swap             *      *      *     *
 ext                    *      *      *     *
 reiserfs jr/3.5/3.6/4  *      *      *     *
@@ -41,9 +44,10 @@ gfs, gfs2              *      -      -     -
 
 Raid members are detected to prevent the probing for a filesystem
 -----------------------------------------------------------------
-linux raid             *      -      *     *
+linux raid (md)        *      *      *     *
 LVM 1                  *      -      -     -
 LVM 2                  *      -      -     *
+ddf                    *      -      *     *
 highpoint              *      -      -     -
 isw_raid               *      -      -     -
 lsi_raid               *      -      -     -
@@ -54,9 +58,6 @@ via_raid               *      -      -     -
 jmicron                *      -      -     -
 adaptec                *      -      -     -
 
-If no label is found vol_id exits with nonzero and the rule will be
-ignored.
-
 To give it a try, you may call it on the commandline:
   $ extras/volume_id/vol_id --export /dev/sda6
   ID_FS_USAGE=filesystem
@@ -66,10 +67,10 @@ To give it a try, you may call it on the commandline:
   ID_FS_LABEL=devel
   ID_FS_LABEL_SAFE=devel
 
-  $ extras/volume_id/vol_id -l /dev/sda6
+  $ extras/volume_id/vol_id --label /dev/sda6
   devel
 
-  $ extras/volume_id/vol_id -t /dev/sda6
+  $ extras/volume_id/vol_id --type /dev/sda6
   ext3
 
 
diff --git a/extras/volume_id/lib/ddf_raid.c b/extras/volume_id/lib/ddf_raid.c
index 9ac5c91e5..560e6bd60 100644
--- a/extras/volume_id/lib/ddf_raid.c
+++ b/extras/volume_id/lib/ddf_raid.c
@@ -1,7 +1,7 @@
 /*
  * volume_id - reads filesystem label and uuid
  *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2007 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -27,6 +27,8 @@
 #include "libvolume_id.h"
 #include "util.h"
 
+/* http://www.snia.org/standards/home */
+
 #define DDF_HEADER			0xDE11DE11
 #define DDF_GUID_LENGTH			24
 #define DDF_REV_LENGTH			8