X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=e7a827a0b0affe01ea8961b067897701ebdcb896;hp=f4cb8fc106ef9dd319f11c7ff663adaedbd4b844;hb=230edbccbfc450275af113825dea345447e7adf0;hpb=bff0d22e5765c0b8f146ede7311bb55fb26d4aaa

diff --git a/autoconfig.functions b/autoconfig.functions
index f4cb8fc..e7a827a 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -2106,7 +2106,8 @@ config_lvm(){
   if checkbootparam 'nolvm' ; then
      ewarn "Skipping LVM code as requested on boot commandline." ; eend 0
   else
-    if ! [ -x /sbin/lvm -a -x /etc/init.d/lvm2 -a -x /sbin/lvdisplay ] ; then
+    # Debian etch provides /etc/init.d/lvm only, newer suites provide /etc/init.d/lvm2
+    if ! [ -x /sbin/lvm -a -x /sbin/lvdisplay ] || ! [ -x /etc/init.d/lvm2 -o -x /etc/init.d/lvm ] ; then
        eerror "LVM not available, can not execute it." ; eend 1
     else
        if lvdisplay 2>&1 | grep -v 'No volume groups found' 1>/dev/null 2>&1 ; then