From c94499d8033d16b68226be1c82b10fa6df700832 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 17 Sep 2007 16:14:54 +0200 Subject: [PATCH] config_lvm(): support Debian etch as well --- autoconfig.functions | 3 ++- debian/changelog | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 diff --git a/debian/changelog b/debian/changelog index 5099850..a4cb92b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-autoconfig (0.7.18) unstable; urgency=low + + * config_lvm(): support Debian etch as well + + -- Michael Prokop Mon, 17 Sep 2007 16:14:39 +0200 + grml-autoconfig (0.7.17) unstable; urgency=low * Update /etc/mtab if running in live-initramfs mode. -- 2.1.4