Compare commits
3 Commits
| Author | SHA1 | Date |
|---|---|---|
Tomas Bzatek
|
3bfb0bfcba | |
|
Tomas Bzatek
|
3ecb867131 | |
Vojtech Trefny
|
2ee78fca64 |
|
|
@ -9,3 +9,4 @@
|
|||
/udisks-2.7.6.tar.bz2
|
||||
/udisks-2.7.7.tar.bz2
|
||||
/udisks-2.8.0.tar.bz2
|
||||
/udisks-2.8.1.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
From b3d9f04f354d2ac21964a637ef42815476b6ff78 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Thu, 13 Sep 2018 16:40:44 -0700
|
||||
Subject: [PATCH] Fix DM_MULTIPATH_DEVICE_PATH in udev rules
|
||||
|
||||
As we worked out in
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1628774 , with
|
||||
multipath-tools 0.7.7 or higher, DM_MULTIPATH_DEVICE_PATH gets
|
||||
set to the value 0 for non-multipath devices in some cases.
|
||||
Before 0.7.7, it was always either set to 1 or not set at all.
|
||||
Now it can be set to 0, checks like this:
|
||||
|
||||
ENV{DM_MULTIPATH_DEVICE_PATH}=="?*"
|
||||
|
||||
don't work right any more, because that check will actually
|
||||
match if the value is 0 (it will only not match if the var is
|
||||
not set at all, or is set to an empty string). Instead we should
|
||||
just check if it is set to exactly 1, otherwise assume the device
|
||||
isn't multipath.
|
||||
|
||||
The impact of this is I think quite limited: we only skip two
|
||||
rules if this check matches, and they only affect mdraid devices.
|
||||
On installed systems without any multipath devices, the bug
|
||||
should not happen, because there should be no /etc/multipath.conf
|
||||
and when that file doesn't exist, the multipath rules skip out
|
||||
early and don't wind up setting the value to 0 ever. I think the
|
||||
only cases affected by this are 'generic' environments like live
|
||||
images and installers, and installed systems with multipath
|
||||
devices. In both these cases there will be a /etc/multipath.conf
|
||||
file, so for some devices, the multipath rules will get far
|
||||
enough to set the value to 0. The consequence will be that the
|
||||
UDISKS_MD_* values that these two rules try to set will not get
|
||||
set for devices they *should* get set for. I'm not sure what the
|
||||
further consequences of that are, if any.
|
||||
|
||||
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
||||
---
|
||||
data/80-udisks2.rules | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
|
||||
index e8f7c5ee..a64f1cb3 100644
|
||||
--- a/data/80-udisks2.rules
|
||||
+++ b/data/80-udisks2.rules
|
||||
@@ -10,7 +10,7 @@
|
||||
# Skip probing if not a block device or if requested by other rules
|
||||
#
|
||||
SUBSYSTEM!="block", GOTO="udisks_probe_end"
|
||||
-ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="udisks_probe_end"
|
||||
+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="udisks_probe_end"
|
||||
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end"
|
||||
|
||||
# MD-RAID (aka Linux Software RAID) members
|
||||
--
|
||||
2.19.0
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (udisks-2.8.0.tar.bz2) = 3814c4c02fbadc58d9e3a6615f015d385648211f12075ce46eb0016605f102fa0c8eeca152f2e03491522b484c43039901bf8f1be2f469ac35b1b6259e7e0ceb
|
||||
SHA512 (udisks-2.8.4.tar.bz2) = 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
|
||||
|
|
|
|||
45
udisks2.spec
45
udisks2.spec
|
|
@ -18,6 +18,9 @@
|
|||
%define default_luks_encryption luks1
|
||||
|
||||
%define is_fedora 0%{?rhel} == 0
|
||||
%define is_git %(git show > /dev/null 2>&1 && echo 1 || echo 0)
|
||||
%define git_hash %(git log -1 --pretty=format:"%h" || true)
|
||||
%define build_date %(date '+%Y%m%d')
|
||||
|
||||
|
||||
# bcache is not available on RHEL
|
||||
|
|
@ -55,28 +58,23 @@
|
|||
|
||||
Name: udisks2
|
||||
Summary: Disk Manager
|
||||
Version: 2.8.0
|
||||
Release: 2%{?dist}
|
||||
Version: 2.8.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: https://github.com/storaged-project/udisks
|
||||
Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
|
||||
# https://github.com/storaged-project/udisks/pull/576
|
||||
# Fix udev multipath device check for device-mapper-multipath 0.7.7+
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1628192
|
||||
Patch0: 0001-Fix-DM_MULTIPATH_DEVICE_PATH-in-udev-rules.patch
|
||||
|
||||
BuildRequires: glib2-devel >= %{glib2_version}
|
||||
BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
|
||||
BuildRequires: libgudev1-devel >= %{systemd_version}
|
||||
BuildRequires: libatasmart-devel >= %{libatasmart_version}
|
||||
BuildRequires: polkit-devel >= %{polkit_version}
|
||||
BuildRequires: systemd >= %{systemd_version}
|
||||
BuildRequires: systemd-devel >= %{systemd_version}
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: redhat-rpm-config
|
||||
BuildRequires: libblockdev-devel >= %{libblockdev_version}
|
||||
BuildRequires: libblockdev-part-devel >= %{libblockdev_version}
|
||||
|
|
@ -140,7 +138,6 @@ manipulate disks, storage devices and technologies.
|
|||
|
||||
%package -n lib%{name}
|
||||
Summary: Dynamic library to access the udisksd daemon
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
Provides: libstoraged = %{version}-%{release}
|
||||
Obsoletes: libstoraged
|
||||
|
|
@ -151,7 +148,6 @@ access to the udisksd daemon.
|
|||
|
||||
%package -n %{name}-iscsi
|
||||
Summary: Module for iSCSI
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: iscsi-initiator-utils
|
||||
|
|
@ -164,7 +160,6 @@ This package contains module for iSCSI configuration.
|
|||
|
||||
%package -n %{name}-lvm2
|
||||
Summary: Module for LVM2
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: lvm2
|
||||
|
|
@ -179,7 +174,6 @@ This package contains module for LVM2 configuration.
|
|||
|
||||
%package -n lib%{name}-devel
|
||||
Summary: Development files for lib%{name}
|
||||
Group: Development/Libraries
|
||||
Requires: lib%{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Provides: libstoraged-devel = %{version}-%{release}
|
||||
|
|
@ -192,7 +186,6 @@ dynamic library, which provides access to the udisksd daemon.
|
|||
%if 0%{?with_bcache}
|
||||
%package -n %{name}-bcache
|
||||
Summary: Module for Bcache
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: libblockdev-kbd >= %{libblockdev_version}
|
||||
|
|
@ -207,7 +200,6 @@ This package contains module for Bcache configuration.
|
|||
%if 0%{?with_btrfs}
|
||||
%package -n %{name}-btrfs
|
||||
Summary: Module for BTRFS
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: libblockdev-btrfs >= %{libblockdev_version}
|
||||
|
|
@ -222,7 +214,6 @@ This package contains module for BTRFS configuration.
|
|||
%if 0%{?with_lsm}
|
||||
%package -n %{name}-lsm
|
||||
Summary: Module for LSM
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: libstoragemgmt
|
||||
|
|
@ -238,7 +229,6 @@ This package contains module for LSM configuration.
|
|||
%if 0%{?with_zram}
|
||||
%package -n %{name}-zram
|
||||
Summary: Module for ZRAM
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: libblockdev-kbd >= %{libblockdev_version}
|
||||
|
|
@ -255,7 +245,6 @@ This package contains module for ZRAM configuration.
|
|||
%if 0%{?with_vdo}
|
||||
%package -n %{name}-vdo
|
||||
Summary: Module for VDO
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
Requires: vdo
|
||||
|
|
@ -268,14 +257,12 @@ This package contains module for VDO management.
|
|||
|
||||
%prep
|
||||
%setup -q -n udisks-%{version}
|
||||
%patch0 -p1
|
||||
sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/"
|
||||
|
||||
%build
|
||||
autoreconf -ivf
|
||||
# modules need to be explicitly enabled
|
||||
%configure \
|
||||
--sysconfdir=/etc \
|
||||
%if %{with_gtk_doc}
|
||||
--enable-gtk-doc \
|
||||
%else
|
||||
|
|
@ -354,8 +341,9 @@ udevadm trigger
|
|||
%endif
|
||||
%{_sysconfdir}/udisks2/udisks2.conf
|
||||
|
||||
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
|
||||
%{_datadir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
|
||||
%{_datadir}/bash-completion/completions/udisksctl
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
%{_unitdir}/udisks2.service
|
||||
%{_unitdir}/clean-mount-point@.service
|
||||
%{_udevrulesdir}/80-udisks2.rules
|
||||
|
|
@ -442,6 +430,21 @@ udevadm trigger
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jul 22 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.4-1
|
||||
- Version 2.8.4
|
||||
|
||||
* Thu Jun 13 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.3-1
|
||||
- Version 2.8.3
|
||||
|
||||
* Fri Mar 15 2019 Debarshi Ray <rishi@fedoraproject.org> - 2.8.2-2
|
||||
- Update for tmpfiles.d snippet
|
||||
|
||||
* Mon Mar 04 2019 Tomas Bzatek <tbzatek@redhat.com> - 2.8.2-1
|
||||
- Version 2.8.2
|
||||
|
||||
* Wed Sep 26 2018 Vojtech Trefny <vtrefny@redhat.com> - 2.8.1-1
|
||||
- Version 2.8.1
|
||||
|
||||
* Fri Sep 14 2018 Adam Williamson <awilliam@redhat.com> - 2.8.0-2
|
||||
- Backport PR #576 to fix udev multipath device check (see RHBZ#1628192)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue