|
 |
712866 |
From 915618bc4fbbc631bf7661506b85fc5758f3ce26 Mon Sep 17 00:00:00 2001
|
|
|
712866 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
712866 |
Date: Thu, 3 Apr 2014 08:54:27 +0200
|
|
|
712866 |
Subject: [PATCH] lvm:module-setup.sh: check for existance of
|
|
|
712866 |
69-dm-lvm-metad.rules
|
|
|
712866 |
|
|
|
712866 |
Before modifying 69-dm-lvm-metad.rules, we should check for the
|
|
|
712866 |
existance first. Otherwise this results in error messages on
|
|
|
712866 |
distributions (debian), which do not ship these rules.
|
|
|
712866 |
|
|
|
712866 |
(cherry picked from commit 12819a579900b9691e2bfaf14e76fbb025851530)
|
|
|
712866 |
---
|
|
|
712866 |
modules.d/90lvm/module-setup.sh | 3 ++-
|
|
|
712866 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
712866 |
|
|
|
712866 |
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
|
|
|
5c6c2a |
index 1c962d54..4a49fc7d 100755
|
|
|
712866 |
--- a/modules.d/90lvm/module-setup.sh
|
|
|
712866 |
+++ b/modules.d/90lvm/module-setup.sh
|
|
|
712866 |
@@ -78,7 +78,8 @@ install() {
|
|
|
712866 |
inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
|
|
|
712866 |
|
|
|
712866 |
# Do not run lvmetad update via pvscan in udev rule - lvmetad is not running yet in dracut!
|
|
|
712866 |
- if grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then
|
|
|
712866 |
+ if [[ -f ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules ]] && \
|
|
|
712866 |
+ grep -q SYSTEMD_WANTS ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules; then
|
|
|
712866 |
sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
712866 |
sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|
|
|
712866 |
sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules
|