r861 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Mon Mar 28 12:42:03 2011
New Revision: 861

Log:
* debian/changelog: Update.
* debian/lvm2.init: Remove stop action.
* debian/rules: Update.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/lvm2.init
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Mon Mar 28 12:25:58 2011	(r860)
+++ lvm2/trunk/debian/changelog	Mon Mar 28 12:42:03 2011	(r861)
@@ -2,6 +2,7 @@
 
   * Remove udev dependency from init script. (closes: #543163)
   * Don't longer create device nodes in init script.
+  * Don't longer try to stop devices on shutdown.
 
  -- Bastian Blank <waldi at debian.org>  Mon, 28 Mar 2011 14:17:30 +0200
 

Modified: lvm2/trunk/debian/lvm2.init
==============================================================================
--- lvm2/trunk/debian/lvm2.init	Mon Mar 28 12:25:58 2011	(r860)
+++ lvm2/trunk/debian/lvm2.init	Mon Mar 28 12:42:03 2011	(r861)
@@ -8,7 +8,7 @@
 # X-Start-Before:    checkfs mountall
 # X-Stop-After:      umountfs
 # Default-Start:     S
-# Default-Stop:      0 6
+# Default-Stop:
 ### END INIT INFO
 
 SCRIPTNAME=/etc/init.d/lvm2
@@ -24,11 +24,6 @@
 	/sbin/vgchange -aly --ignorelockingfailure || return 2
 }
 
-do_stop()
-{
-	/sbin/vgchange -aln --ignorelockingfailure || return 2
-}
-
 case "$1" in
   start)
 	log_begin_msg "Setting up LVM Volume Groups"
@@ -38,18 +33,10 @@
 		2) log_end_msg 1 ;;
 	esac
 	;;
-  stop)
-	log_begin_msg "Shutting down LVM Volume Groups"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  restart|force-reload)
+  stop|restart|force-reload)
 	;;
   *)
-	echo "Usage: $SCRIPTNAME {start|stop}" >&2
+	echo "Usage: $SCRIPTNAME start" >&2
 	exit 3
 	;;
 esac

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Mon Mar 28 12:25:58 2011	(r860)
+++ lvm2/trunk/debian/rules	Mon Mar 28 12:42:03 2011	(r861)
@@ -229,7 +229,7 @@
 install_lvm2: DIR = $(BUILD_DIR)/install_deb
 install_lvm2: $(STAMPS_DIR)/install_deb
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	dh_installinit --no-start -- start 26 S . start 50 0 6 .
+	dh_installinit --no-start -- start 26 S .
 	+$(MAKE_SELF) install-base
 
 install_lvm2-udeb: export DH_OPTIONS = -plvm2-udeb