rpms/device-mapper/devel device-mapper-mknod.patch, NONE, 1.1 device-mapper.spec, 1.17, 1.18

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/device-mapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4489

Modified Files:
	device-mapper.spec 
Added Files:
	device-mapper-mknod.patch 
Log Message:
- fix device node creation


device-mapper-mknod.patch:
 libdm-iface.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE device-mapper-mknod.patch ---
--- device-mapper.1.01.05/lib/ioctl/libdm-iface.c.mknod	2005-11-16 16:35:41.000000000 -0500
+++ device-mapper.1.01.05/lib/ioctl/libdm-iface.c	2005-11-16 16:36:41.000000000 -0500
@@ -1352,8 +1352,11 @@
 	command = _cmd_data_v4[dmt->type].cmd;
 
 	/* Old-style creation had a table supplied */
-	if (dmt->type == DM_DEVICE_CREATE && dmt->head)
-		return _create_and_load_v4(dmt);
+	if (dmt->type == DM_DEVICE_CREATE && dmt->head) {
+		int ret = _create_and_load_v4(dmt);
+	        update_devs();
+                return ret;
+        }
 
 	if (dmt->type == DM_DEVICE_MKNODES && !dmt->dev_name &&
 	    !dmt->uuid && dmt->major <= 0)
@@ -1386,27 +1389,32 @@
 	case DM_DEVICE_CREATE:
 		add_dev_node(dmt->dev_name, MAJOR(dmi->dev), MINOR(dmi->dev),
 			     dmt->uid, dmt->gid, dmt->mode);
+	        update_devs();
 		break;
 
 	case DM_DEVICE_REMOVE:
 		/* FIXME Kernel needs to fill in dmi->name */
 		if (dmt->dev_name)
 			rm_dev_node(dmt->dev_name);
+	        update_devs();
 		break;
 
 	case DM_DEVICE_RENAME:
 		/* FIXME Kernel needs to fill in dmi->name */
 		if (dmt->dev_name)
 			rename_dev_node(dmt->dev_name, dmt->newname);
+	        update_devs();
 		break;
 
 	case DM_DEVICE_MKNODES:
+	        update_devs();
 		if (dmi->flags & DM_EXISTS_FLAG)
 			add_dev_node(dmi->name, MAJOR(dmi->dev),
 				     MINOR(dmi->dev),
 				     dmt->uid, dmt->gid, dmt->mode);
 		else if (dmt->dev_name)
 			rm_dev_node(dmt->dev_name);
+	        update_devs();
 		break;
 
 	case DM_DEVICE_STATUS:


Index: device-mapper.spec
===================================================================
RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- device-mapper.spec	13 Oct 2005 15:33:51 -0000	1.17
+++ device-mapper.spec	16 Nov 2005 21:42:07 -0000	1.18
@@ -1,12 +1,13 @@
 Summary: device mapper library
 Name: device-mapper
 Version: 1.01.05
-Release: 2.0
+Release: 3
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/dm
 Source0: %{name}.%{version}.tgz
-Patch: device-mapper-selinux.patch
+Patch0: device-mapper-selinux.patch
+Patch1: device-mapper-mknod.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: libselinux-devel, libsepol-devel
 
@@ -18,7 +19,8 @@
 
 %prep
 %setup -q -n %{name}.%{version}
-%patch -p1
+%patch0 -p1 -b .selinux
+%patch1 -p1 -b .mknod
 
 %build
 %configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660
@@ -47,6 +49,10 @@
 
 
 %changelog
+* Wed Nov 16 2005 Peter Jones <pjones at redha.tcom> - 1.01.05-3
+- make device nodes after create/remove/rename, rather than when the library
+  exits.
+
 * Thu Oct 13 2005 Florian La Roche <laroche at redhat.com>
 - add linking against -lsepol