lvm2: Enable cmdlib and dmeventd

index 6566b32..0183e05 100644
@@ -13,7 +13,8 @@ LVM2_LICENSE_FILES = COPYING COPYING.LIB
 
 # Make sure that binaries and libraries are installed with write
 # permissions for the owner.
-LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig
+LVM2_CONF_OPT += --enable-write_install --enable-pkgconfig \
+				 --enable-cmdlib --enable-dmeventd
 
 # LVM2 uses autoconf, but not automake, and the build system does not
 # take into account the CC passed at configure time.

deleted file mode 100644
index 0d6ae75..0000000
@@ -1,22 +0,0 @@
-[PATCH]: dmraid: fix make remove for header files
-
-prefix/include/dmraid is not empty, so we need rm -rf
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- 1.0.0.rc15/include/Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: dmraid/1.0.0.rc15/include/Makefile.in
-===================================================================
---- dmraid.orig/1.0.0.rc15/include/Makefile.in
-+++ dmraid/1.0.0.rc15/include/Makefile.in
-@@ -24,7 +24,7 @@ install: install_dmraid_headers
- 
- remove_dmraid_headers:
- 	@echo "Removing $(HEADERS) from $(includedir)/dmraid"
--	rm -f $(includedir)/dmraid
-+	rm -rf $(includedir)/dmraid
- 
- remove:        remove_dmraid_headers
- 

index 067df0b..089e33a 100644
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-DMRAID_VERSION = 1.0.0.rc15
+DMRAID_VERSION = 1.0.0.rc16-3
 DMRAID_SOURCE = dmraid-$(DMRAID_VERSION).tar.bz2
 DMRAID_SITE = http://people.redhat.com/~heinzm/sw/dmraid/src
-DMRAID_SUBDIR = $(DMRAID_VERSION)
+DMRAID_SUBDIR = $(DMRAID_VERSION)/dmraid
 # lib and tools race with parallel make
 DMRAID_MAKE = $(MAKE1)
 DMRAID_INSTALL_STAGING = YES

deleted file mode 100644
index fbe2894..0000000
@@ -1,20 +0,0 @@
---- a/1.0.0.rc15/lib/device/scan.c.orig	2008-06-20 09:32:05.000000000 -0500
-+++ b/1.0.0.rc15/lib/device/scan.c	2008-12-01 17:15:25.000000000 -0600
-@@ -69,7 +69,7 @@
- 	static char *ret = NULL, *sysfs_mp;
- 
- 	if (!(sysfs_mp = find_sysfs_mp(lc)))
--		LOG_ERR(lc, NULL, "finding sysfs mount point");
-+		{ log_notice(lc, "finding sysfs mount point"); return NULL; }
- 
- 	if ((ret = dbg_malloc(strlen(sysfs_mp) + strlen(path) + 1)))
- 		sprintf(ret, "%s%s", sysfs_mp, path);
-@@ -315,7 +315,7 @@
- 	} else {
- 		sysfs = 0;
- 		path = (char *) _PATH_DEV;
--		log_print(lc, "carrying on with %s", path);
-+		log_notice(lc, "carrying on with %s", path);
- 	}
- 
- 	if (!(d = opendir(path))) {

deleted file mode 100644
index a1c33c7..0000000
@@ -1,15 +0,0 @@
-Why on earth are we trying to link against the libdir in DESTDIR?
-
-Signed-Off-By: Nigel Kukard  <[email protected]>
-diff -ur dmraid_vanilla/1.0.0.rc15/tools/Makefile.in dmraid_library-linking-fix/1.0.0.rc15/tools/Makefile.in
---- dmraid_vanilla/1.0.0.rc15/tools/Makefile.in	2008-09-17 13:24:00.000000000 +0000
-+++ dmraid_library-linking-fix/1.0.0.rc15/tools/Makefile.in	2009-06-01 10:50:52.000000000 +0000
-@@ -56,7 +56,7 @@
- 
- dmraid:	$(OBJECTS) $(top_srcdir)/lib/libdmraid.a
- 	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib \
--	      -L$(DESTDIR)$(libdir) $(DMRAIDLIBS) $(LIBS) 
-+	      $(DMRAIDLIBS) $(LIBS) 
- 
- install_dmraid_tools: $(TARGETS)
- 	@echo "Installing $(TARGETS) in $(sbindir)"; \

new file mode 100644
index 0000000..fd2ad9e
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+[ -x /usr/sbin/dmraid ] || exit 0
+
+# try to load module in case that hasn't been done yet
+modprobe dm-mod >/dev/null 2>&1
+
+case "$1" in
+	start|"")
+		echo "Setting up DMRAID devices..."
+		/usr/sbin/dmraid --activate yes --ignorelocking --verbose
+		;;
+
+	stop)
+		echo "Shutting down DMRAID devices... "
+		/usr/sbin/dmraid --activate no --ignorelocking --verbose
+		;;
+
+	restart|force-reload)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+
+	*)
+		echo "Usage: dmraid {start|stop|restart|force-reload}"
+		exit 1
+		;;
+esac

deleted file mode 100644
index fd2ad9e..0000000
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-set -e
-
-[ -x /usr/sbin/dmraid ] || exit 0
-
-# try to load module in case that hasn't been done yet
-modprobe dm-mod >/dev/null 2>&1
-
-case "$1" in
-	start|"")
-		echo "Setting up DMRAID devices..."
-		/usr/sbin/dmraid --activate yes --ignorelocking --verbose
-		;;
-
-	stop)
-		echo "Shutting down DMRAID devices... "
-		/usr/sbin/dmraid --activate no --ignorelocking --verbose
-		;;
-
-	restart|force-reload)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	*)
-		echo "Usage: dmraid {start|stop|restart|force-reload}"
-		exit 1
-		;;
-esac

index 089e33a..412c903 100644
@@ -15,10 +15,10 @@ DMRAID_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 DMRAID_DEPENDENCIES = lvm2
 
-define DMRAID_INSTALL_INITSCRIPT
-	$(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/S20dmraid
+define DMRAID_INSTALL_INIT_SYSV
+    [ -f $(TARGET_DIR)/etc/init.d/S20dmraid ] || \
+        $(INSTALL) -D -m 0755 package/dmraid/S20dmraid \
+            $(TARGET_DIR)/etc/init.d/S20dmraid
 endef
 
-DMRAID_POST_INSTALL_TARGET_HOOKS += DMRAID_INSTALL_INITSCRIPT
-
 $(eval $(autotools-package))