fix selinux library linking

superblocks. [Luca Berra]

VERSION

@@ -1 +1 @@
-2.00.12-cvs (2004-04-14)
+2.00.15-cvs (2004-04-19)

WHATS_NEW

@@ -1,5 +1,15 @@
-Version 2.00.13 - 64 Apr 2004
+Version 2.00.15 - 19 Apr 2004
 =============================
+  configure --with-owner= --with-group= to avoid -o and -g args to 'install'
+
+Version 2.00.14 - 16 Apr 2004
+=============================
+  Use 64-bit file functions by default.
+
+Version 2.00.13 - 16 Apr 2004
+=============================
+  Set devices/md_component_detection = 1 to ignore devices containing md
+  superblocks. [Luca Berra]
   Ignore error setting selinux file context if fs doesn't support it.
 
 Version 2.00.12 - 14 Apr 2004

WHATS_NEW_DM

@@ -1,3 +1,8 @@
+Version 1.00.17 - 17 Apr 2004
+=============================
+  configure --with-owner= --with-group= to avoid -o and -g args to 'install'
+  Fix library selinux linking.
+
 Version 1.00.16 - 16 Apr 2004
 =============================
   Ignore error setting selinux file context if fs doesn't support it.

configure

@@ -3907,24 +3907,31 @@ esac
 
 
 
+OWNER="root"
+GROUP="root"
+
 
 # Check whether --with-user or --without-user was given.
 if test "${with_user+set}" = set; then
   withval="$with_user"
    OWNER="$withval"
-else
-   OWNER="root"
 fi;
 
+if test x$OWNER != x; then
+	OWNER="-o $OWNER"
+fi
+
 
 # Check whether --with-group or --without-group was given.
 if test "${with_group+set}" = set; then
   withval="$with_group"
    GROUP="$withval"
-else
-   GROUP="root"
 fi;
 
+if test x$GROUP != x; then
+	GROUP="-g $GROUP"
+fi
+
 # Check whether --enable-lvm1_fallback or --disable-lvm1_fallback was given.
 if test "${enable_lvm1_fallback+set}" = set; then
   enableval="$enable_lvm1_fallback"

configure.in

@@ -74,17 +74,26 @@ esac
 dnl -- prefix is /usr by default, the exec_prefix default is setup later
 AC_PREFIX_DEFAULT(/usr)
 
+OWNER="root"
+GROUP="root"
+
 dnl -- setup the ownership of the files
 AC_ARG_WITH(user,
   [  --with-user=USER        Set the owner of installed files ],
-  [ OWNER="$withval" ],
-  [ OWNER="root" ])
+  [ OWNER="$withval" ])
+
+if test x$OWNER != x; then
+	OWNER="-o $OWNER"
+fi
 
 dnl -- setup the group ownership of the files
 AC_ARG_WITH(group,
   [  --with-group=GROUP      Set the group owner of installed files ],
-  [ GROUP="$withval" ],
-  [ GROUP="root" ])
+  [ GROUP="$withval" ])
+
+if test x$GROUP != x; then
+	GROUP="-g $GROUP"
+fi
 
 dnl -- LVM1 tool fallback option
 AC_ARG_ENABLE(lvm1_fallback, [  --enable-lvm1_fallback  Use this to fall back and use LVM1 binaries if

doc/Makefile.in

@@ -23,7 +23,7 @@ include ../make.tmpl
 install:
 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
 		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
-		@INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 644 $(CONFSRC) \
+		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
 			$(confdir)/$(CONFDEST); \
 	fi
 

doc/example.conf

@@ -27,9 +27,6 @@ devices {
     # the device will be accepted or rejected (ignored).  Devices that
     # don't match any patterns are accepted.
 
-    # If using RAID md devices as physical volumes, you should
-    # set up a filter here to reject the constituent devices.
-
     # Remember to run vgscan after you change this parameter to ensure 
     # that the cache file gets regenerated (see below).
 
@@ -57,14 +54,21 @@ devices {
     # You can turn off writing this cache file by setting this to 0.
     write_cache_state = 1
 
-    # An advanced setting.
+    # Advanced settings.
+
     # List of pairs of additional acceptable block device types found 
     # in /proc/devices with maximum (non-zero) number of partitions.
     # types = [ "fd", 16 ]
 
     # If sysfs is mounted (2.6 kernels) restrict device scanning to 
     # the block devices it believes are valid.
+    # 1 enables; 0 disables.
     sysfs_scan = 1	
+
+    # By default, LVM2 will ignore devices used as components of
+    # software RAID (md) devices by looking for md superblocks.
+    # 1 enables; 0 disables.
+    md_component_detection = 1
 }
 
 # This section that allows you to configure the nature of the

include/.symlinks

@@ -14,6 +14,7 @@
 ../lib/device/device.h
 ../lib/display/display.h
 ../lib/filters/filter-composite.h
+../lib/filters/filter-md.h
 ../lib/filters/filter-persistent.h
 ../lib/filters/filter-regex.h
 ../lib/filters/filter-sysfs.h

lib/Makefile.in

@@ -37,6 +37,7 @@ SOURCES =\
 	filters/filter-persistent.c \
 	filters/filter-regex.c \
 	filters/filter-sysfs.c \
+	filters/filter-md.c \
 	filters/filter.c \
 	format_text/archive.c \
 	format_text/export.c \

lib/commands/toolcontext.c

@@ -23,6 +23,7 @@
 #include "activate.h"
 #include "filter.h"
 #include "filter-composite.h"
+#include "filter-md.h"
 #include "filter-persistent.h"
 #include "filter-regex.h"
 #include "filter-sysfs.h"
@@ -275,7 +276,7 @@ static int _init_dev_cache(struct cmd_context *cmd)
 	return 1;
 }
 
-#define MAX_FILTERS 3
+#define MAX_FILTERS 4
 
 static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
 {
@@ -285,14 +286,24 @@ static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
 
 	memset(filters, 0, sizeof(filters));
 
-	/* sysfs filter */
+	/*
+	 * Filters listed in order: top one gets applied first.
+	 * Failure to initialise some filters is not fatal.
+	 * Update MAX_FILTERS definition above when adding new filters.
+	 */
+
+	/*
+	 * sysfs filter. Only available on 2.6 kernels.  Non-critical.
+	 * Listed first because it's very efficient at eliminating 
+	 * unavailable devices.
+	 */
 	if (find_config_bool(cmd->cft->root, "devices/sysfs_scan",
 			     DEFAULT_SYSFS_SCAN)) {
 		if ((filters[nr_filt] = sysfs_filter_create(cmd->proc_dir)))
 			nr_filt++;
 	}
 
-	/* regex filter */
+	/* regex filter. Optional. */
 	if (!(cn = find_config_node(cmd->cft->root, "devices/filter")))
 		log_debug("devices/filter not found in config file: no regex "
 			  "filter installed");
@@ -302,14 +313,21 @@ static struct dev_filter *_init_filter_components(struct cmd_context *cmd)
 		return NULL;
 	}
 
-	/* device type filter */
+	/* device type filter. Required. */
 	cn = find_config_node(cmd->cft->root, "devices/types");
 	if (!(filters[nr_filt++] = lvm_type_filter_create(cmd->proc_dir, cn))) {
 		log_error("Failed to create lvm type filter");
 		return NULL;
 	}
 
-	/* only build a composite filter if we really need it */
+	/* md component filter. Optional, non-critical. */
+	if (find_config_bool(cmd->cft->root, "devices/md_component_detection",
+			     DEFAULT_MD_COMPONENT_DETECTION)) {
+		if ((filters[nr_filt] = md_filter_create()))
+			nr_filt++;
+	}
+
+	/* Only build a composite filter if we really need it. */
 	return (nr_filt == 1) ?
 	    filters[0] : composite_filter_create(nr_filt, filters);
 }

lib/config/defaults.h

@@ -29,6 +29,7 @@
 #define DEFAULT_DEV_DIR "/dev"
 #define DEFAULT_PROC_DIR "/proc"
 #define DEFAULT_SYSFS_SCAN 1
+#define DEFAULT_MD_COMPONENT_DETECTION 1
 
 #define DEFAULT_LOCK_DIR "/var/lock/lvm"
 #define DEFAULT_LOCKING_LIB "lvm2_locking.so"

lib/device/dev-io.c

@@ -51,12 +51,6 @@
 #  endif
 #endif
 
-
-/* FIXME Use _llseek for 64-bit
-_syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo, loff_t *, res, uint, wh);
- if (_llseek((unsigned) fd, (ulong) (offset >> 32), (ulong) (offset & 0xFFFFFFFF), &pos, SEEK_SET) < 0) { 
-*/
-
 static LIST_INIT(_open_devices);
 
 /*-----------------------------------------------------------------

lib/filters/filter-md.c

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2004 Luca Berra
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "lib.h"
+#include "filter-md.h"
+#include "metadata.h"
+
+#ifdef linux
+
+/* Lifted from <linux/raid/md_p.h> because of difficulty including it */
+
+#define MD_SB_MAGIC 0xa92b4efc
+#define MD_RESERVED_BYTES (64 * 1024)
+#define MD_RESERVED_SECTORS (MD_RESERVED_BYTES / 512)
+#define MD_NEW_SIZE_SECTORS(x) ((x & ~(MD_RESERVED_SECTORS - 1)) \
+				- MD_RESERVED_SECTORS)
+
+static int _ignore_md(struct dev_filter *f, struct device *dev)
+{
+	uint64_t size, sector;
+	uint32_t md_magic;
+
+	if (!dev_get_size(dev, &size)) {
+		stack;
+		return 0;
+	}
+
+	if (size < MD_RESERVED_SECTORS * 2)
+		/*
+		 * We could ignore it since it is obviously too
+		 * small, but that's not our job.
+		 */
+		return 1;
+
+	if (!dev_open(dev)) {
+		stack;
+		return 0;
+	}
+
+	sector = MD_NEW_SIZE_SECTORS(size);
+
+	/* Check if it is an md component device. */
+	if (dev_read(dev, sector << SECTOR_SHIFT, sizeof(uint32_t), &md_magic)) {
+		if (md_magic == MD_SB_MAGIC) {
+			log_debug("%s: Skipping md component device",
+				  dev_name(dev));
+			if (!dev_close(dev))
+				stack;
+			return 0;
+		}
+	}
+
+	if (!dev_close(dev))
+		stack;
+
+	return 1;
+}
+
+static void _destroy(struct dev_filter *f)
+{
+	dbg_free(f);
+}
+
+struct dev_filter *md_filter_create(void)
+{
+	struct dev_filter *f;
+
+	if (!(f = dbg_malloc(sizeof(*f)))) {
+		log_error("md filter allocation failed");
+		return NULL;
+	}
+
+	f->passes_filter = _ignore_md;
+	f->destroy = _destroy;
+	f->private = NULL;
+
+	return f;
+}
+
+#else
+
+struct dev_filter *md_filter_create(void)
+{
+	return NULL;
+}
+
+#endif

lib/filters/filter-md.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2004 Luca Berra
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LVM_FILTER_MD_H
+#define _LVM_FILTER_MD_H
+
+#include "dev-cache.h"
+
+struct dev_filter *md_filter_create(void);
+
+#endif
+

lib/format1/Makefile.in

@@ -32,7 +32,7 @@ include ../../make.tmpl
 .PHONY: install
 
 install: liblvm2format1.so
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 		$(libdir)/liblvm2format1.so.$(LIB_VERSION)
 	$(LN_S) -f liblvm2format1.so.$(LIB_VERSION) $(libdir)/liblvm2format1.so
 

lib/misc/lib.h

@@ -21,6 +21,7 @@
 
 #define _REENTRANT
 #define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
 
 #include "log.h"
 #include "dbg_malloc.h"

libdm/Makefile.in

@@ -39,24 +39,24 @@ install: $(INSTALL_TYPE)
 
 install_dynamic: install_@interface@
 	$(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(libdir)/libdevmapper.so
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
 		$(includedir)/libdevmapper.h
 
 install_static: install_@interface@_static
 	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
 		$(includedir)/libdevmapper.h
 
 install_fs: fs/libdevmapper.so
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 		$(libdir)/libdevmapper.so.$(LIB_VERSION)
 
 install_ioctl: ioctl/libdevmapper.so
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 		$(libdir)/libdevmapper.so.$(LIB_VERSION)
 
 install_ioctl_static: ioctl/libdevmapper.a
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
 		$(libdir)/libdevmapper.a.$(LIB_VERSION)
 
 .PHONY: distclean_lib distclean

man/Makefile.in

@@ -34,12 +34,12 @@ install:
 	@for f in $(MAN8); \
 	do \
 	   $(RM) $(MAN8DIR)/$$f; \
-	   @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
 	done
 
 	@echo "Installing $(MAN5) in $(MAN5DIR)"
 	@for f in $(MAN5); \
 	do \
 	   $(RM) $(MAN5DIR)/$$f; \
-	   @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
+	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
 	done

po/Makefile.in

@@ -25,7 +25,7 @@ install: $(TARGETS)
 	@echo Installing translation files in $(localedir)
 	@( \
 		for lang in $(LANGS); do \
-			$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 $$lang.mo \
+			$(INSTALL) -D $(OWNER) $(GROUP) -m 444 $$lang.mo \
 			    $(localedir)/$$lang/LC_MESSAGES/@INTL_PACKAGE@.mo;\
 	  done; \
 	)

tools/Makefile.in

@@ -108,21 +108,21 @@ liblvm2cmd.so: liblvm2cmd.a $(LD_DEPS)
 	install_tools_dynamic install_tools_static
 
 install_cmdlib_dynamic: liblvm2cmd.so
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \
 		$(libdir)/liblvm2cmd.so.$(LIB_VERSION)
 	$(LN_S) -f liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.so
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 lvm2cmd.h \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
 		$(includedir)/lvm2cmd.h
 
 install_cmdlib_static: liblvm2cmd.a
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.a \
 		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
 	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 lvm2cmd.h \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
 		$(includedir)/lvm2cmd.h
 
 install_tools_dynamic: lvm .commands
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
 		$(sbindir)/lvm
 	@echo Creating symbolic links for individual commands in $(sbindir)
 	@( \
@@ -133,7 +133,7 @@ install_tools_dynamic: lvm .commands
 	)
 
 install_tools_static: lvm.static
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) lvm.static \
+	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
 		$(staticdir)/lvm.static
 
 install: $(INSTALL_TARGETS)

tools/tools.h

@@ -17,6 +17,7 @@
 #define _LVM_TOOLS_H
 
 #define _GNU_SOURCE
+#define _FILE_OFFSET_BITS 64
 
 #include <assert.h>