From 8e410431c8a88bb49b3512aaa39f7ad5d9ba0276 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 13 Dec 2013 11:08:17 +0100 Subject: dracut-034-64.git20131205.1 - fixed lvm thin check Resolves: rhbz#1040669 --- dracut.spec | 8 ++++++-- lvm-fixed-lvm-thin-check.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 lvm-fixed-lvm-thin-check.patch diff --git a/dracut.spec b/dracut.spec index 5a37d89..14bcfbe 100644 --- a/dracut.spec +++ b/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 034 -Release: 64.git20131205%{?dist} +Release: 64.git20131205%{?dist}.1 Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -92,7 +92,7 @@ Patch59: 0059-i18n-introduce-i18n_install_all-to-install-everythin.patch #Patch61: 0061-dracut.spec-remove-suse-man-pages.patch #Patch62: 0062-TODO-update.patch Patch63: 0063-systemd-dracut-initqueue.sh-fixed-waiting-in-the-loo.patch - +Patch64: lvm-fixed-lvm-thin-check.patch BuildRequires: bash git @@ -515,6 +515,10 @@ rm -rf -- $RPM_BUILD_ROOT %endif %changelog +* Fri Dec 13 2013 Harald Hoyer 034-64.git20131205.1 +- fixed lvm thin check +Resolves: rhbz#1040669 + * Thu Dec 05 2013 Harald Hoyer 034-64.git20131205 - fixed failing the boot while waiting for password input diff --git a/lvm-fixed-lvm-thin-check.patch b/lvm-fixed-lvm-thin-check.patch new file mode 100644 index 0000000..c7f8f7a --- /dev/null +++ b/lvm-fixed-lvm-thin-check.patch @@ -0,0 +1,31 @@ +From 920384c4128691941f9bd8819eae2b4f334aa7b1 Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Fri, 13 Dec 2013 11:05:39 +0100 +Subject: [PATCH] lvm: fixed lvm thin check + +--- + modules.d/90lvm/module-setup.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh +index 1206310..c62dc90 100755 +--- a/modules.d/90lvm/module-setup.sh ++++ b/modules.d/90lvm/module-setup.sh +@@ -99,8 +99,13 @@ install() { + + if [[ $hostonly ]] && type -P lvs &>/dev/null; then + for dev in "${!host_fs_types[@]}"; do +- if [[ "$(lvs --noheadings -o segtype "$dev" 2>/dev/null)" == *thin* ]] ; then ++ [ -e /sys/block/${dev#/dev/}/dm/name ] || continue ++ dev=$(/dev/null) ++ [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || continue ++ if [[ "$(lvs --noheadings -o segtype ${DM_VG_NAME} 2>/dev/null)" == *thin* ]] ; then + inst_multiple -o thin_dump thin_restore thin_check thin_repair ++ break + fi + done + fi +-- +1.8.4.2 + -- cgit