r121 - in multipath-tools/trunk/debian: . scripts
Bastian Blank
pkg-lvm-maintainers@lists.alioth.debian.org
Tue, 05 Jul 2005 07:25:56 +0000
Author: waldi
Date: Tue Jul 5 07:25:55 2005
New Revision: 121
Added:
multipath-tools/trunk/debian/compat
multipath-tools/trunk/debian/multipath-tools.docs
multipath-tools/trunk/debian/multipath-tools.examples
multipath-tools/trunk/debian/multipath-tools.install
multipath-tools/trunk/debian/multipath-tools.manpages
Removed:
multipath-tools/trunk/debian/conffiles
multipath-tools/trunk/debian/multipath-tools.config
multipath-tools/trunk/debian/multipath-tools.dirs
multipath-tools/trunk/debian/multipath-tools.postinst
multipath-tools/trunk/debian/multipath-tools.preinst
multipath-tools/trunk/debian/multipath-tools.substvars
multipath-tools/trunk/debian/scripts/
Modified:
multipath-tools/trunk/debian/multipath-tools.init
multipath-tools/trunk/debian/rules
Log:
* debian/multipath-tools.init, debian/rules: Update.
* debian/compat, debian/multipath-tools.docs, debian/multipath-tools.examples,
debian/multipath-tools.install, debian/multipath-tools.manpages: Add.
* debian/conffiles, debian/multipath-tools.config, debian/multipath-tools.dirs,
debian/multipath-tools.postinst, debian/multipath-tools.preinst,
debian/multipath-tools.substvars, debian/scripts: Remove.
Added: multipath-tools/trunk/debian/compat
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/compat Tue Jul 5 07:25:55 2005
@@ -0,0 +1 @@
+4
Added: multipath-tools/trunk/debian/multipath-tools.docs
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/multipath-tools.docs Tue Jul 5 07:25:55 2005
@@ -0,0 +1,2 @@
+FAQ
+README
Added: multipath-tools/trunk/debian/multipath-tools.examples
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/multipath-tools.examples Tue Jul 5 07:25:55 2005
@@ -0,0 +1,2 @@
+multipath.conf.annotated
+multipath.conf.synthetic
Modified: multipath-tools/trunk/debian/multipath-tools.init
==============================================================================
--- multipath-tools/trunk/debian/multipath-tools.init (original)
+++ multipath-tools/trunk/debian/multipath-tools.init Tue Jul 5 07:25:55 2005
@@ -2,28 +2,32 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/sbin/multipathd
-PIDFILE=/var/run/multipathd.pid
+NAME=multipath-tools
+DESC="multipath daemon"
test -x $DAEMON || exit 0
case "$1" in
start)
- echo -n "Starting multipath daemon:"
- /sbin/modprobe sg || true
- start-stop-daemon --start --exec $DAEMON
- echo "multipathd."
+ echo -n "Starting $DESC: "
+ start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS
+ echo "$NAME."
;;
stop)
- echo -n "Stopping multipath daemon: multipathd "
- start-stop-daemon --stop --name multipathd
- echo "."
+ echo -n "Stopping $DESC: "
+ start-stop-daemon --stop --quiet --pidfile /var/run/multipathd.pid --exec $DAEMON
+ echo "$NAME."
;;
- force-reload|restart)
- $0 stop
- $0 start
+ restart|force-reload)
+ echo -n "Restarting $DESC: "
+ start-stop-daemon --stop --quiet --pidfile /var/run/multipathd.pid --exec $DAEMON
+ sleep 1
+ start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS
+ echo "$NAME."
;;
*)
- echo "Usage: /etc/init.d/multipathd {start|stop|restart|force-reload}"
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
esac
Added: multipath-tools/trunk/debian/multipath-tools.install
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/multipath-tools.install Tue Jul 5 07:25:55 2005
@@ -0,0 +1,3 @@
+etc/dev.d/block
+etc/udev/rules.d
+sbin/devmap_name sbin/kpartx sbin/multipath usr/bin/multipathd sbin
Added: multipath-tools/trunk/debian/multipath-tools.manpages
==============================================================================
--- (empty file)
+++ multipath-tools/trunk/debian/multipath-tools.manpages Tue Jul 5 07:25:55 2005
@@ -0,0 +1,4 @@
+devmap_name/devmap_name.8
+kpartx/kpartx.8
+multipathd/multipathd.8
+multipath/multipath.8
Modified: multipath-tools/trunk/debian/rules
==============================================================================
--- multipath-tools/trunk/debian/rules (original)
+++ multipath-tools/trunk/debian/rules Tue Jul 5 07:25:55 2005
@@ -1,59 +1,58 @@
#!/usr/bin/make -f
-SHELL+= -e
+# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include debian/scripts/vars
-
-BUILD_DIR := $(SOURCE_DIR)
-B := $(BUILD_DIR)
-D := $(CURDIR)/debian/tmp
-
DOCS := FAQ README TODO
-all: build
-
-clean:
- $(MAKE) clean
- dh_clean
+build: build-stamp
-build:
+build-stamp:
dh_testdir
+
$(MAKE) $(MAKE_VARIABLES) BUILD=glibc all
+
touch $@
-binary-arch: build
+clean:
+ dh_testdir
+ rm -f build-stamp
+
+ -$(MAKE) clean
+
+ dh_clean
+
+install:
dh_testdir
+ dh_testroot
dh_clean -k
dh_installdirs
- cp $B/multipath/multipath $B/devmap_name/devmap_name \
- $B/kpartx/kpartx \
- $D/sbin/
- cp $B/multipathd/multipathd $D/sbin
-
- install -d $D/etc/dev.d/block
- install --mode=755 $B/multipath/multipath.dev \
- $D/etc/dev.d/block/
-
- dh_installchangelogs $B/ChangeLog
- dh_installdocs $(addprefix $B/,$(DOCS))
- dh_installexamples $B/multipath.conf.annotated
- dh_installexamples $B/multipath.conf.synthetic
- dh_installman $B/*/*.8
- dh_installinit --no-start --update-rcd-params='start 04 S .'
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_install --sourcedir=$(CURDIR)/debian/tmp
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_installinit -- start 04 S .
+ dh_installman
+ dh_link
dh_strip
dh_compress
dh_fixperms
- dh_shlibdeps
- dh_installdebconf
dh_installdeb
+ dh_shlibdeps
dh_gencontrol
+ dh_md5sums
dh_builddeb
-
-binary: binary-arch
-
-
+binary: binary-indep binary-arch
.PHONY: binary binary-arch binary-indep unpack configure build clean