From 38287ad2e291af9c7e2192717276782001da3182 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 26 Nov 2015 06:47:56 +0100 Subject: [PATCH] dracut: update to 044. --- srcpkgs/dracut/patches/d4b93a092db11.patch | 28 ---------------------- srcpkgs/dracut/template | 8 +++---- 2 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/dracut/patches/d4b93a092db11.patch diff --git a/srcpkgs/dracut/patches/d4b93a092db11.patch b/srcpkgs/dracut/patches/d4b93a092db11.patch deleted file mode 100644 index cb144c3dc63..00000000000 --- a/srcpkgs/dracut/patches/d4b93a092db11.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit d4b93a092db1105a29a3f768d1d49ece8b90547a -Author: Fabian Deutsch -Date: Thu Jun 25 11:17:59 2015 +0200 - - Revert "lvm: Don't activate LVs with activationskip set" - - This reverts commit cfa365a32d47388c8476064b23d7d4684f1e591b. - - The logic in commit cfa365a was added to prevent (odl) lvms from - activating snapshots which should not be activated. - Newer lvms however do this automatically (not enabling an LV if the - the 'k' attribute set), thus we can revert the previous commit. - -diff --git a/modules.d/90lvm/lvm_scan.sh b/modules.d/90lvm/lvm_scan.sh -index ce46e14..7495644 100755 ---- modules.d/90lvm/lvm_scan.sh -+++ modules.d/90lvm/lvm_scan.sh -@@ -106,10 +106,6 @@ if [ -n "$LVS" ] ; then - info "Scanning devices $lvmdevs for LVM logical volumes $LVS" - lvm lvscan --ignorelockingfailure 2>&1 | vinfo - for LV in $LVS; do -- if [ "x$(lvm lvs --noheadings --select "lv_attr =~ k" $LV | wc -l)" = "x0" ]; then -- info "Skipping activation of '$LV' because activationskip is set." -- continue -- fi - if [ -z "$sysinit" ]; then - lvm lvchange --yes -ay --ignorelockingfailure $nopoll --ignoremonitoring $LV 2>&1 | vinfo - else diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 4213a07fcfe..0270e4e113f 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,11 +1,11 @@ # Template file for 'dracut' pkgname=dracut -version=043 -revision=9 +version=044 +revision=1 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" hostmakedepends="libxslt docbook-xsl asciidoc" -depends="bash psmisc cpio" +depends="bash psmisc cpio coreutils" conf_files="/etc/dracut.conf" make_dirs=" /etc/dracut.conf.d 0755 root root @@ -15,7 +15,7 @@ short_desc="A new initramfs infrastructure" maintainer="Juan RP " license="GPL-2" distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz" -checksum=1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1 +checksum=84b97c9b0120e9fde06c3b9cf2ede1c4632cccd8e085e980b9ec9c788655af05 post_install() { # kernel hooks.