r248 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Sun Jan 15 17:50:50 2006
New Revision: 248

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/lvm2.preinst
Log:
* debian/changelog
  - Update.
  - Prepare to release (2.02.01-3).
* debian/lvm2.preinst: Fix.


Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Sun Jan 15 17:50:50 2006
@@ -1,3 +1,9 @@
+lvm2 (2.02.01-3) unstable; urgency=low
+
+  * Fix snapshot check to work with set -e. (closes: #348154)
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 15 Jan 2006 13:29:06 +0100
+
 lvm2 (2.02.01-2) unstable; urgency=low
 
   * Abort installation on kernel < 2.6.12.

Modified: lvm2/trunk/debian/lvm2.preinst
==============================================================================
--- lvm2/trunk/debian/lvm2.preinst	(original)
+++ lvm2/trunk/debian/lvm2.preinst	Sun Jan 15 17:50:50 2006
@@ -12,13 +12,9 @@
 	db_title LVM2
 
 	# Check for LVM1 snapshots
-
-	if [ "`/sbin/lvmiopversion`" -le 10 ]; then
-	  [ -x /sbin/lvscan ] && /sbin/lvscan 2>/dev/null | grep Snapshot 2>&1 > /dev/null
-	  if [ "$?" = 0 ]; then
-	    db_input critical lvm2/snapshots || true
-	    db_go
-	  fi
+	if [ "`/sbin/lvmiopversion`" -le 10 ] && [ -x /sbin/lvscan ] && /sbin/lvscan 2>/dev/null | grep Snapshot 2>&1 > /dev/null; then
+	  db_input critical lvm2/snapshots || true
+	  db_go
 	fi
 
 	if ! dpkg --compare-versions $(uname -r) ge '2.6.12'; then