X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F50-lvm;h=9ec8199bf45ebfc29bf5873838f913405e603ae1;hp=e94fc5870de8d55a909f42e7fdefcce79c65651d;hb=HEAD;hpb=d6e316346da529faf3ff8ab1b79c66193ecf21fc

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/50-lvm b/etc/grml/fai/config/scripts/GRMLBASE/50-lvm
index e94fc58..1f65279 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/50-lvm
+++ b/etc/grml/fai/config/scripts/GRMLBASE/50-lvm
@@ -9,13 +9,15 @@
 set -u
 set -e
 
-if ! [ -r "${target}/lib/udev/rules.d/69-lvm-metad.rules" ] ; then
-  echo "File /lib/udev/rules.d/69-lvm-metad.rules doesn't exist, skipping execution of script."
-  exit 0
+if [ -f "${target}/lib/udev/rules.d/69-lvm.rules" ] ; then  # lvm2 >=2.03.15
+  echo "Clearing /lib/udev/rules.d/69-lvm.rules to avoid automatic LVM scanning"
+  echo '# this file was generated by grml-live script GRMLBASE/50-lvm' > "${target}/lib/udev/rules.d/69-lvm.rules"
 fi
 
-echo "Removing /lib/udev/rules.d/69-lvm-metad.rules to avoid automatic LVM scanning"
-rm -f "${target}/lib/udev/rules.d/69-lvm-metad.rules"
+if [ -f "${target}/lib/udev/rules.d/69-lvm-metad.rules" ] ; then  # lvm2 <= 2.03.11
+  echo "Clearing /lib/udev/rules.d/69-lvm-metad.rules to avoid automatic LVM scanning"
+  echo '# this file was generated by grml-live script GRMLBASE/50-lvm' > "${target}/lib/udev/rules.d/69-lvm-metad.rules"
+fi
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2