From 8611f8851edbe428fbef7042c85570dc72b5895a Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Wed, 5 Dec 2007 17:05:04 +0000 Subject: [PATCH] pre-release --- WHATS_NEW_DM | 13 ++++++------- man/dmsetup.8.in | 2 +- tools/dmsetup.c | 9 ++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index eec49cdde..5ff6da2c9 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,13 +1,12 @@ -Version 1.02.23 - -================================== +Version 1.02.23 - 5th December 2007 +=================================== Update dm-ioctl.h after removal of compat code. - Add --readahead to dmsetup. - Add external read_ahead library functions and DM_READ_AHEAD_* definitions. + Add readahead support to libdevmapper and dmsetup. Fix double free in a libdevmapper-event error path. Fix configure --with-dmeventd-path substitution. - Allow $DM_DEV_DIR envvar to override default of "/dev". - Create e.g., libdevmapper.so.1.02, in build dir alongside the .so file. - Avoid static link failure with some SELinux libraries. + Allow a DM_DEV_DIR environment variable to override /dev. + Create a libdevmapper.so.$LIB_VERSION symlink within the build tree. + Avoid static link failure with some SELinux libraries that require libpthread. Remove obsolete dmfs code from tree and update INSTALL. Version 1.02.22 - 21st August 2007 diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in index 0d3947b9d..c5ba9325b 100644 --- a/man/dmsetup.8.in +++ b/man/dmsetup.8.in @@ -353,7 +353,7 @@ for creating devices with holes in them. .TP \fBDM_DEV_DIR\fP The device directory name. -Defaults to "/dev" and must be an absolute name. +Defaults to "/dev" and must be an absolute path. .SH AUTHORS Original version: Joe Thornber (thornber@sistina.com) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 5e569401a..3432402b9 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -2194,8 +2194,8 @@ static char *parse_loop_device_name(const char *dev, const char *dev_dir) /* If dev_dir does not end in a slash, ensure that the following byte in the device string is "/". */ - if (dev_dir[strlen(dev_dir) - 1] != '/' - && device[strlen(dev_dir)] != '/') + if (dev_dir[strlen(dev_dir) - 1] != '/' && + device[strlen(dev_dir)] != '/') goto error; strncpy(buf, strrchr(device, '/') + 1, (size_t) PATH_MAX); @@ -2611,12 +2611,11 @@ int main(int argc, char **argv) dev_dir = getenv ("DM_DEV_DIR"); if (dev_dir && *dev_dir) { if (!dm_set_dev_dir(dev_dir)) { - fprintf(stderr, "Invalid DM_DEV_DIR envvar value.\n"); + fprintf(stderr, "Invalid DM_DEV_DIR environment variable value.\n"); goto out; } - } else { + } else dev_dir = DEFAULT_DM_DEV_DIR; - } if (!_process_switches(&argc, &argv, dev_dir)) { fprintf(stderr, "Couldn't process command line.\n"); -- 2.43.5