Bug#384909: lvm-common: add lsb logging

[David Härdeman]

Package: lvm-common
Version: 1.5.20
Severity: minor
Tags: patch

Hi,

the attached patch changes the lvm-common init.d script(s) to use lsb
logging functions.

Regards,
David
-------------- next part --------------
diff -ur ./lvm-common-1.5.20.orig/debian/control ./lvm-common-1.5.20/debian/control
--- ./lvm-common-1.5.20.orig/debian/control	2005-08-01 21:52:09.000000000 +0200
+++ ./lvm-common-1.5.20/debian/control	2006-08-27 21:58:57.000000000 +0200
@@ -7,7 +7,7 @@
 
 Package: lvm-common
 Architecture: any
-Depends: ${shlibs:Depends}, module-init-tools|modutils (>> 2.3.11-2)
+Depends: ${shlibs:Depends}, module-init-tools|modutils (>> 2.3.11-2), lsb-base (>= 3.0-10)
 Recommends: logrotate
 Replaces: lvm
 Conflicts: lvm, lvm5 (<= 0.8i-4), lvm6 (<= 0.8.final-2), lvm10 (<= 0.9-1)
diff -ur ./lvm-common-1.5.20.orig/debian/init ./lvm-common-1.5.20/debian/init
--- ./lvm-common-1.5.20.orig/debian/init	2005-08-01 21:49:44.000000000 +0200
+++ ./lvm-common-1.5.20/debian/init	2006-08-27 21:58:20.000000000 +0200
@@ -11,6 +11,7 @@
 
 set -e
 
+. /lib/lsb/init-functions
 test -x /sbin/lvmiopversion -a -x /sbin/vgscan -a -x /sbin/vgchange || exit 0
 test -f /etc/default/lvm-common && . /etc/default/lvm-common
 
@@ -36,7 +37,7 @@
 
 case "$1" in
 	start|"")
-		echo "Setting up LVM Volume Groups..."
+		log_action_begin_msg "Setting up LVM Volume Groups"
 		create_lvm_device
 		create_dm_device
                 test `/sbin/lvmiopversion` != "0" || exit 0
@@ -56,15 +57,17 @@
                         chmod $MOD $DEV
                         chown --dereference $OWN $DEV
                 done
+		log_action_end_msg 0
 		;;
 	
 	stop)
-		echo "Shutting down LVM Volume Groups... "
+		log_action_begin_msg "Shutting down LVM Volume Groups"
 		if test `/sbin/lvmiopversion` -ge 200 -a -x /lib/lvm-200/lvm; then
 			/sbin/vgchange --ignorelockingfailure -a n
        		else
 			[ -e /etc/lvmtab ] && /sbin/vgchange -a n
         	fi
+		log_action_end_msg 0
 		;;
 
 	restart|force-reload)
@@ -75,6 +78,7 @@
 	
 	*)
 		echo "Usage: lvm {start|stop|force-reload}" >&2
-		exit 1
+		exit 2
 		;;
 esac
+exit 0