[PATCH] udev_volume_id: remove temporary node creation and parent handling

udev can create the temporary node for us now. (On bootup we don't
know where a writable filesystem is mounted). Also the parent handling
is not needed anymore, cause udev is able to pass us the node name
of the parent device.

2 files changed, 25 insertions, 91 deletions

diff --git a/extras/volume_id/README b/extras/volume_id/README
index 9d881a1a05..d570615e10 100644
--- a/extras/volume_id/README
+++ b/extras/volume_id/README
@@ -3,43 +3,37 @@ udev_volume_id - partition, filesystem, disklabel reader
 
 This program is normally called from a udev rule, to provide udev with the
 name, uuid or the filesystem type of a partition to name a device node.
-udev_volume_id opens the blockdevice specified by the environment variable
-DEVPATH and searches for a filesystem superblock to read the label. The
-following commandline switches are supported to specify what udev_volume_id
+udev_volume_id opens the blockdevice node specified at the commandline.
+The following commandline switches are supported to specify what udev_volume_id
 should print to stdout:
 
        no option prints all values
   -h   prints help text
   -l   prints the label of the partition
   -u   prints the uuid of the partition
-  -d   read disk instead of partition
-
-If -d is specified udev_volume_id tries to read the label from the main
-block device where the partition belongs to. For now this is only useful
-for s390 dasd labels.
 
 udev_volume_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.
 
 The following rule will create a symlink named with the label string:
-  KERNEL="[hs]d*", PROGRAM="/sbin/udev_volume_id -l", SYMLINK="%c"
+  KERNEL="[hs]d*", PROGRAM="/sbin/udev_volume_id -l %N", SYMLINK="%c"
 
 If no label is found udev_volume_id exits with nonzero and the rule will be
 ignored.
 
 To give it a try, you may call it on the commandline:
 
-  [root@pim udev.kay]# DEVPATH=/block/hda/hda3 extras/volume_id/udev_volume_id
+  [root@pim udev.kay]# extras/volume_id/udev_volume_id /dev/hda3
   T:ext3
   L:Music Store
   N:Music_Store
   U:d2da42b5-bbd9-44eb-a72c-cc4542fcb71e
 
-  [root@pim udev.kay]# DEVPATH=/block/hda/hda3 extras/volume_id/udev_volume_id -l
+  [root@pim udev.kay]# extras/volume_id/udev_volume_id -l /dev/hda3
   Music_Store
 
-  [root@pim udev.kay]# DEVPATH=/block/hda/hda1 extras/volume_id/udev_volume_id -t
+  [root@pim udev.kay]# extras/volume_id/udev_volume_id -t /dev/hda3
   swap
 
 
diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c
index f04f374c27..843b70baf5 100644
--- a/extras/volume_id/udev_volume_id.c
+++ b/extras/volume_id/udev_volume_id.c
@@ -1,10 +1,10 @@
 /*
  * udev_volume_id - udev callout to read filesystem label and uuid
  *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	sample udev rule for creation of a symlink with the filsystem uuid:
- *	KERNEL="sd*", PROGRAM="/sbin/udev_volume_id -u", SYMLINK="%c"
+ *	KERNEL="sd*", PROGRAM="/sbin/udev_volume_id -u %N", SYMLINK="%c"
  *
  *	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
@@ -28,7 +28,6 @@
 #include <ctype.h>
 #include <sys/ioctl.h>
 
-#include "../../libsysfs/sysfs/libsysfs.h"
 #include "../../udev_utils.h"
 #include "../../logging.h"
 #include "volume_id/volume_id.h"
@@ -47,49 +46,18 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-static struct volume_id *open_classdev(struct sysfs_class_device *class_dev)
-{
-	struct volume_id *vid;
-	struct sysfs_attribute *attr;
-	int major, minor;
-
-	attr = sysfs_get_classdev_attr(class_dev, "dev");
-
-	if (attr == NULL) {
-		printf("error reading 'dev' attribute\n");
-		return NULL;
-	}
-
-	if (sscanf(attr->value, "%u:%u", &major, &minor) != 2) {
-		printf("error getting major/minor number\n");
-		return NULL;
-	}
-
-	vid = volume_id_open_dev_t(makedev(major, minor));
-	if (vid == NULL) {
-		printf("error open volume\n");
-		return NULL;
-	}
-
-	return vid;
-}
+extern int optind;
 
 int main(int argc, char *argv[])
 {
-	const char help[] = "usage: udev_volume_id [-t|-l|-u|-d]\n"
+	const char help[] = "usage: udev_volume_id [-t|-l|-u] <device>\n"
 			    "       -t filesystem type\n"
 			    "       -l filesystem label\n"
 			    "       -u filesystem uuid\n"
-			    "       -d disk label from main device\n"
 			    "\n";
-	static const char short_options[] = "htlud";
-	char sysfs_mnt_path[SYSFS_PATH_MAX];
-	char dev_path[SYSFS_PATH_MAX];
-	struct sysfs_class_device *class_dev = NULL;
-	struct sysfs_class_device *class_dev_parent = NULL;
+	static const char short_options[] = "htlu";
 	struct volume_id *vid = NULL;
-	char *devpath;
-	char probe_disk_label = 0;
+	const char *device;
 	char print = 'a';
 	static char name[VOLUME_ID_LABEL_SIZE];
 	int len, i, j;
@@ -115,9 +83,6 @@ int main(int argc, char *argv[])
 		case 'u':
 			print = 'u';
 			continue;
-		case 'd':
-			probe_disk_label = 1;
-			continue;
 		case 'h':
 		case '?':
 		default:
@@ -126,49 +91,26 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	devpath = getenv("DEVPATH");
-	if (devpath == NULL) {
-		printf("error DEVPATH empty\n");
-		goto exit;
-	}
-
-	if (sysfs_get_mnt_path(sysfs_mnt_path, SYSFS_PATH_MAX) != 0) {
-		printf("error getting sysfs mount path\n");
-		goto exit;
+	device = argv[optind];
+	if (device == NULL) {
+		printf(help);
+		exit(1);
 	}
 
-	strfieldcpy(dev_path, sysfs_mnt_path);
-	strfieldcat(dev_path, devpath);
-
-	class_dev = sysfs_open_class_device_path(dev_path);
-	if (class_dev == NULL) {
-		printf("error getting class device\n");
+	vid = volume_id_open_node(device);
+	if (vid == NULL) {
+		printf("error open volume\n");
 		goto exit;
 	}
 
-	if (probe_disk_label == 0) {
-		vid = open_classdev(class_dev);
-		if (vid == NULL)
-			goto exit;
+	if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0)
+		size = 0;
 
-		if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0)
-			size = 0;
-
-		if (volume_id_probe_all(vid, 0, size) == 0)
-			goto print;
-	} else {
-		/* if we are on a partition, open main block device instead */
-		class_dev_parent = sysfs_get_classdev_parent(class_dev);
-		if (class_dev_parent != NULL)
-			vid = open_classdev(class_dev_parent);
-		else
-			vid = open_classdev(class_dev);
-		if (vid == NULL)
-			goto exit;
+	if (volume_id_probe_all(vid, 0, size) == 0)
+		goto print;
 
-		if (volume_id_probe_dasd(vid) == 0)
-			goto print;
-	}
+	if (volume_id_probe_dasd(vid) == 0)
+		goto print;
 
 	printf("unknown volume type\n");
 	goto exit;
@@ -229,8 +171,6 @@ print:
 	rc = 0;
 
 exit:
-	if (class_dev != NULL)
-		sysfs_close_class_device(class_dev);
 	if (vid != NULL)
 		volume_id_close(vid);