Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb44456-lock' into 'master'
[udisks2] Lock filesystem mount whitelisting. Contributes to JB#44456

See merge request mer-core/udisks2!22
  • Loading branch information
rainemak committed Feb 25, 2019
2 parents b76d4fe + 285ccb9 commit fd36be1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions rpm/udisks2-fs-mount-whitelist.txt
@@ -0,0 +1 @@
/org/freedesktop/udisks2/filesystem/whitelist
6 changes: 6 additions & 0 deletions rpm/udisks2.spec
Expand Up @@ -14,6 +14,8 @@ Group: System Environment/Libraries
URL: https://github.com/storaged-project/udisks
Source0: %{name}-%{version}.tar.bz2
Source1: udisks2-symlink-mount-path
Source2: udisks2-fs-mount-whitelist.txt

Patch1: 0001-Disable-libblockdev-mdraid-and-part-support-from-sou.patch
Patch2: 0002-Drop-smartata-dependencies.patch
Patch3: 0003-Loosen-up-polkit-policies-to-work-from-another-seat.patch
Expand Down Expand Up @@ -150,6 +152,9 @@ chrpath --delete %{buildroot}/%{_libexecdir}/udisks2/udisksd
mkdir -p %{buildroot}/%{_oneshotdir}/
install -m 0755 %{SOURCE1} %{buildroot}/%{_oneshotdir}

mkdir -p %{buildroot}/%{_sysconfdir}/dconf/db/vendor.d/locks/
install -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/dconf/db/vendor.d/locks/

mkdir -p %{buildroot}/%{_unitdir}/graphical.target.wants
ln -s ../udisks2.service %{buildroot}/%{_unitdir}/graphical.target.wants/udisks2.service

Expand Down Expand Up @@ -179,6 +184,7 @@ fi
%{_sysconfdir}/udisks2/udisks2.conf

%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
%{_sysconfdir}/dconf/db/vendor.d/locks/*
%{_datadir}/bash-completion/completions/udisksctl
%{_unitdir}/udisks2.service
%{_unitdir}/graphical.target.wants/udisks2.service
Expand Down

0 comments on commit fd36be1

Please sign in to comment.