From 6c611ca004e5fce162ba256fc729034c40a4e0f5 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Oct 22 2012 10:49:02 +0000 Subject: set selinux boolean only if not already set (#868298) --- diff --git a/ecryptfs-utils-99-selinux.patch b/ecryptfs-utils-99-selinux.patch index 07f945f..5859ae0 100644 --- a/ecryptfs-utils-99-selinux.patch +++ b/ecryptfs-utils-99-selinux.patch @@ -5,7 +5,7 @@ diff -up ecryptfs-utils-99/src/utils/ecryptfs-migrate-home.selinux ecryptfs-util error "Cannot proceed." fi # start encryption -+ setsebool -P use_ecryptfs_home_dirs=1 1>/dev/null 2>&1 ||: ++ [[ "$(getsebool use_ecryptfs_home_dirs 2>/dev/null)" =~ off$ ]] && setsebool -P use_ecryptfs_home_dirs=1 1>/dev/null 2>&1 ||: orig=$(mktemp /home/$USER_NAME.XXXXXXXX) rm "$orig" && mv "$USER_HOME" "$orig" chmod 700 "$orig" diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index e903523..767977c 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -5,7 +5,7 @@ Name: ecryptfs-utils Version: 100 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -262,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Mon Oct 22 2012 Michal Hlavinka - 100-5 +- set selinux boolean only if not already set (#868298) + * Thu Oct 18 2012 Michal Hlavinka - 100-4 - fix typo in restorecon path (#865839)