- Blkid changes

- Allow udev access to usb_device_t
- Fix post script to create targeted policy config file
This commit is contained in:
Daniel J Walsh 2006-03-08 20:40:43 +00:00
parent 4c9f658bb2
commit 9c64bb6f27
1 changed files with 12 additions and 4 deletions

View File

@ -10,7 +10,7 @@
Summary: SELinux policy configuration Summary: SELinux policy configuration
Name: selinux-policy Name: selinux-policy
Version: 2.2.23 Version: 2.2.23
Release: 7 Release: 8
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: serefpolicy-%{version}.tgz Source: serefpolicy-%{version}.tgz
@ -204,7 +204,7 @@ SELinux Reference policy targeted base module.
%pre targeted %pre targeted
%saveFileContext targeted %saveFileContext targeted
%post targeted %post
if [ ! -s /etc/selinux/config ]; then if [ ! -s /etc/selinux/config ]; then
# #
# New install so we will default to targeted policy # New install so we will default to targeted policy
@ -229,14 +229,17 @@ SETLOCALDEFS=0
ln -sf ../selinux/config /etc/sysconfig/selinux ln -sf ../selinux/config /etc/sysconfig/selinux
restorecon /etc/selinux/config 2> /dev/null restorecon /etc/selinux/config 2> /dev/null
else else
. /etc/selinux/config
# if first time update booleans.local needs to be copied to sandbox # if first time update booleans.local needs to be copied to sandbox
[ -f /etc/selinux/targeted/booleans.local ] && mv /etc/selinux/targeted/booleans.local /etc/selinux/targeted/modules/active/ [ -f /etc/selinux/${SELINUXTYPE}/booleans.local ] && mv /etc/selinux/${SELINUXTYPE}/booleans.local /etc/selinux/targeted/modules/active/
[ -f /etc/selinux/targeted/seusers ] && cp -f /etc/selinux/targeted/seusers /etc/selinux/targeted/modules/active/seusers [ -f /etc/selinux/${SELINUXTYPE}/seusers ] && cp -f /etc/selinux/${SELINUXTYPE}/seusers /etc/selinux/${SELINUXTYPE}/modules/active/seusers
grep -q "^SETLOCALDEFS" /etc/selinux/config || echo -n " grep -q "^SETLOCALDEFS" /etc/selinux/config || echo -n "
# SETLOCALDEFS= Check local definition changes # SETLOCALDEFS= Check local definition changes
SETLOCALDEFS=0 SETLOCALDEFS=0
">> /etc/selinux/config ">> /etc/selinux/config
fi fi
%post targeted
%rebuildpolicy targeted %rebuildpolicy targeted
%relabel targeted %relabel targeted
@ -296,6 +299,11 @@ ln -sf ../devel/include /usr/share/selinux/strict/include
%fileList strict %fileList strict
%changelog %changelog
* Wed Mar 8 2006 Dan Walsh <dwalsh@redhat.com> 2.2.23-8
- Blkid changes
- Allow udev access to usb_device_t
- Fix post script to create targeted policy config file
* Wed Mar 8 2006 Dan Walsh <dwalsh@redhat.com> 2.2.23-7 * Wed Mar 8 2006 Dan Walsh <dwalsh@redhat.com> 2.2.23-7
- Allow lvm tools to create drevice dir - Allow lvm tools to create drevice dir