commit device-mapper

7 Dec 2006

Hello community,

here is the log from the commit of package device-mapper
checked in at Thu Dec 7 19:34:55 CET 2006.

--------

--- device-mapper/device-mapper.changes	2006-10-16 13:01:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/device-mapper/device-mapper.changes	2006-12-06 09:59:16.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec  6 09:58:48 CET 2006  - fehr@suse.de
+
+- update to new version 1.02.13
+  Update dmsetup man page (setgeometry & message).
+  Fix dmsetup free after getline with debug.
+  Suppress encryption key in 'dmsetup table' output unless --showkeys supplied.
+  
+-------------------------------------------------------------------

Old:
----
  device-mapper.1.02.12.tar.bz2

New:
----
  device-mapper.1.02.13.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ device-mapper.spec ++++++
--- /var/tmp/diff_new_pack.JHCx8U/_old	2006-12-07 19:33:31.000000000 +0100
+++ /var/tmp/diff_new_pack.JHCx8U/_new	2006-12-07 19:33:31.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package device-mapper (Version 1.02.12)
+# spec file for package device-mapper (Version 1.02.13)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -10,10 +10,10 @@
 
 
 Name:           device-mapper
-License:        GPL, LGPL
+License:        GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Group:          System/Base
 Autoreqprov:    on
-Version:        1.02.12
+Version:        1.02.13
 Release:        1
 Summary:        Device Mapper Tools
 Source:         device-mapper.%{version}.tar.bz2
@@ -96,6 +96,11 @@
 /usr/include/libdevmapper.h
 
 %changelog -n device-mapper
+* Wed Dec 06 2006 - fehr@suse.de
+- update to new version 1.02.13
+  Update dmsetup man page (setgeometry & message).
+  Fix dmsetup free after getline with debug.
+  Suppress encryption key in 'dmsetup table' output unless --showkeys supplied.
 * Mon Oct 16 2006 - fehr@suse.de
 - update to new version 1.02.12
   Avoid deptree attempting to suspend a device that's already suspended.


++++++ device-mapper.1.02.12.tar.bz2 -> device-mapper.1.02.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.12/VERSION new/device-mapper.1.02.13/VERSION
--- old/device-mapper.1.02.12/VERSION	2006-10-13 20:54:35.000000000 +0200
+++ new/device-mapper.1.02.13/VERSION	2006-11-28 23:51:25.000000000 +0100
@@ -1 +1 @@
-1.02.12 (2006-10-13)
+1.02.13 (2006-11-28)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.12/WHATS_NEW new/device-mapper.1.02.13/WHATS_NEW
--- old/device-mapper.1.02.12/WHATS_NEW	2006-10-13 20:43:53.000000000 +0200
+++ new/device-mapper.1.02.13/WHATS_NEW	2006-11-28 23:49:58.000000000 +0100
@@ -1,3 +1,9 @@
+Version 1.02.13 - 28 Nov 2006
+=============================
+  Update dmsetup man page (setgeometry & message).
+  Fix dmsetup free after getline with debug.
+  Suppress encryption key in 'dmsetup table' output unless --showkeys supplied.
+
 Version 1.02.12 - 13 Oct 2006
 =============================
   Avoid deptree attempting to suspend a device that's already suspended.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.12/dmsetup/dmsetup.c new/device-mapper.1.02.13/dmsetup/dmsetup.c
--- old/device-mapper.1.02.12/dmsetup/dmsetup.c	2006-10-12 19:09:09.000000000 +0200
+++ new/device-mapper.1.02.13/dmsetup/dmsetup.c	2006-10-19 17:34:50.000000000 +0200
@@ -114,6 +114,7 @@
 	NOOPENCOUNT_ARG,
 	NOTABLE_ARG,
 	OPTIONS_ARG,
+	SHOWKEYS_ARG,
 	TABLE_ARG,
 	TARGET_ARG,
 	TREE_ARG,
@@ -211,7 +212,11 @@
 	r = 1;
 
       out:
+#ifndef HAVE_GETLINE
 	dm_free(buffer);
+#else
+	free(buffer);
+#endif
 	if (file)
 		fclose(fp);
 	return r;
@@ -915,7 +920,7 @@
 	void *next = NULL;
 	uint64_t start, length;
 	char *target_type = NULL;
-	char *params;
+	char *params, *c;
 	int cmd;
 	struct dm_names *names = (struct dm_names *) data;
 	const char *name = NULL;
@@ -978,6 +983,17 @@
 			if (data && !_switches[VERBOSE_ARG])
 				printf("%s: ", name);
 			if (target_type) {
+
+			/* Suppress encryption key */
+			if (!_switches[SHOWKEYS_ARG] &&
+			    !strcmp(target_type, "crypt")) {
+				c = params;
+				while (*c && *c != ' ')
+					c++;
+				c++;
+				while (*c && *c != ' ')
+					*c++ = '0';
+			}
 				printf("%" PRIu64 " %" PRIu64 " %s %s",
 				       start, length, target_type, params);
 			}
@@ -1522,7 +1538,7 @@
 	{"info", "[<device>]", 0, 1, _info},
 	{"deps", "[<device>]", 0, 1, _deps},
 	{"status", "[<device>] [--target <target_type>]", 0, 1, _status},
-	{"table", "[<device>] [--target <target_type>]", 0, 1, _status},
+	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, 1, _status},
 	{"wait", "<device> [<event_nr>]", 0, 2, _wait},
 	{"mknodes", "[<device>]", 0, 1, _mknodes},
 	{"targets", "", 0, 0, _targets},
@@ -1868,6 +1884,7 @@
 		{"noopencount", 0, &ind, NOOPENCOUNT_ARG},
 		{"notable", 0, &ind, NOTABLE_ARG},
 		{"options", 1, &ind, OPTIONS_ARG},
+		{"showkeys", 0, &ind, SHOWKEYS_ARG},
 		{"table", 1, &ind, TABLE_ARG},
 		{"target", 1, &ind, TARGET_ARG},
 		{"tree", 0, &ind, TREE_ARG},
@@ -1988,6 +2005,8 @@
 			_switches[NOLOCKFS_ARG]++;
 		if ((ind == NOOPENCOUNT_ARG))
 			_switches[NOOPENCOUNT_ARG]++;
+		if ((ind == SHOWKEYS_ARG))
+			_switches[SHOWKEYS_ARG]++;
 		if ((ind == TABLE_ARG)) {
 			_switches[TABLE_ARG]++;
 			_table = optarg;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/device-mapper.1.02.12/man/dmsetup.8 new/device-mapper.1.02.13/man/dmsetup.8
--- old/device-mapper.1.02.12/man/dmsetup.8	2006-10-12 17:42:25.000000000 +0200
+++ new/device-mapper.1.02.13/man/dmsetup.8	2006-11-23 21:34:16.000000000 +0100
@@ -30,6 +30,9 @@
 .B dmsetup rename
 .I device_name new_name
 .br
+.B dmsetup message
+.I device_name sector message
+.br
 .B dmsetup ls [--target target_type] [--exec command] [--tree [-o options]]
 .br
 .B dmsetup info 
@@ -58,6 +61,9 @@
 .br
 .B dmsetup version
 .br
+.B dmsetup setgeometry
+.I device_name cyl head sect start
+.br
 
 .B devmap_name
 .I major minor
@@ -167,6 +173,10 @@
 .br
 Loads <table> or table_file into the inactive table slot for device_name.
 If neither is supplied, reads a table from standard input.
+.IP \fBmessage
+.I device_name sector message
+.br
+Send message to target. If sector not needed use 0.
 .IP \fBmknodes
 .I [device_name]
 .br
@@ -205,6 +215,10 @@
 Un-suspends a device.  
 If an inactive table has been loaded, it becomes live.
 Postponed I/O then gets re-queued for processing.
+.IP \fBsetgeometry
+.I device_name cyl head sect start
+.br
+Sets the device geometry to C/H/S.
 .IP \fBstatus
 .I [--target target_type]
 .I [device_name]


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)