Update sipb-xen-clvm-config for Hardy

svn path=/trunk/packages/sipb-xen-clvm-config/; revision=927

diff --git a/debian/changelog b/debian/changelog
index 46111f3..3f37d8b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-clvm-config (3.0) unstable; urgency=low
+
+  * Update sipb-xen-clvm-config for Hardy
+
+ -- Evan Broder <broder@mit.edu>  Mon, 22 Sep 2008 20:08:27 -0400
+

 sipb-xen-clvm-config (2.0) unstable; urgency=low
 
   * Depend on multipath-tools because we're going to want it
 sipb-xen-clvm-config (2.0) unstable; urgency=low
 
   * Depend on multipath-tools because we're going to want it

diff --git a/debian/init b/debian/init
deleted file mode 100755 (executable)
index 52e49b4..0000000
--- a/debian/init
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          sipb-xen-clvm-config
-# Required-Start:    $ccs $cman
-# Required-Stop:
-# Should-Start:      $network
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Start clvm daemon
-# Description:       Network file systems are mounted by
-#                    /etc/network/if-up.d/mountnfs in the background
-#                    when interfaces are brought up; this script waits
-#                    for them to be mounted before carrying on.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/sbin/clvmd
-NAME=sipb-xen-clvm-config
-PIDFILE=/var/run/cluster/clvmd.pid
-DESC="Cluster LVM"
-
-test -x $DAEMON || exit 0
-
-CLVMD_OPTIONS=""
-
-if [ -f /etc/default/sipb-xen-clvm-config ] ; then
-       . /etc/default/sipb-xen-clvm-config
-fi
-
-set -e
-
-case "$1" in
-  start)
-       echo -n "Starting $DESC: "
-       start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $CLVMD_OPTIONS
-       echo "$NAME."
-       ;;
-  stop)
-       echo -n "Stopping $DESC: "
-       start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --exec $DAEMON
-       echo "$NAME."
-       ;;
-  restart|force-reload)
-       echo -n "Restarting $DESC: "
-       $0 stop
-       sleep 1
-       $0 start
-       echo "$NAME."
-       ;;
-  *)
-       N=/etc/init.d/$NAME
-       echo "Usage: $N {start|stop|restart|force-reload}" >&2
-       exit 1
-       ;;
-esac
-
-exit 0

diff --git a/debian/rules b/debian/rules
index 6a092e6..277de58 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
 DEB_DIVERT_EXTENSION = .sipb-xen
 DEB_DIVERT_FILES_sipb-xen-clvm-config += \
        /etc/lvm/lvm.conf.sipb-xen \
 DEB_DIVERT_EXTENSION = .sipb-xen
 DEB_DIVERT_FILES_sipb-xen-clvm-config += \
        /etc/lvm/lvm.conf.sipb-xen \

-       /etc/udev/multipath.rules.sipb-xen

 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk

diff --git a/files/etc/udev/multipath.rules.sipb-xen b/files/etc/udev/multipath.rules.sipb-xen
deleted file mode 100644 (file)
index 3f3642f..0000000
--- a/files/etc/udev/multipath.rules.sipb-xen
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# multipath and multipath partitions nodes are created in /dev/mapper/
-# this file should be installed in /etc/udev/rules.d
-#
-
-# take care of devmap partitioning
-ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
-       PROGRAM="/sbin/dmsetup -j %M -m %m status", \
-       RESULT=="*multipath*", \
-       PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", \
-       RUN+="/sbin/kpartx -a /dev/mapper/%c"
-