config_lvm(): check for 'No volume groups found'

diff --git a/autoconfig.functions b/autoconfig.functions
index 06e5168..07c3344 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -2097,7 +2097,7 @@ config_lvm(){
     if ! [ -x /sbin/lvm -a -x /etc/init.d/lvm2 -a -x /sbin/lvdisplay ] ; then
        eerror "LVM not available, can not execute it." ; eend 1
     else
     if ! [ -x /sbin/lvm -a -x /etc/init.d/lvm2 -a -x /sbin/lvdisplay ] ; then
        eerror "LVM not available, can not execute it." ; eend 1
     else

-       if lvdisplay 1>/dev/null 2>&1 ; then
+       if lvdisplay 2>&1 | grep -v 'No volume groups found' 1>/dev/null 2>&1 ; then

           einfo "You seem to have logical volumes (LVM) on your system."
           eindent
           einfo "Just run 'Start lvm2' to activate them or boot using 'lvm' as bootoption for autostart."
           einfo "You seem to have logical volumes (LVM) on your system."
           eindent
           einfo "Just run 'Start lvm2' to activate them or boot using 'lvm' as bootoption for autostart."

diff --git a/debian/changelog b/debian/changelog
index f68c64b..fa97332 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.7.6) unstable; urgency=low
+
+  * config_lvm(): check for 'No volume groups found' as lvdisplay does
+    not provide appropriate return code for us.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 11 Jul 2007 19:25:25 +0200
+

 grml-autoconfig (0.7.5) unstable; urgency=low
 
   * Integrate /etc/init.d/loadcpufreq in config_cpu() [Closes: issue238]
 grml-autoconfig (0.7.5) unstable; urgency=low
 
   * Integrate /etc/init.d/loadcpufreq in config_cpu() [Closes: issue238]