* Tue Jul 18 2006 Dan Walsh <dwalsh@redhat.com> 1.30.17-5

- Fix handling of restorecond
This commit is contained in:
Daniel J Walsh 2006-07-18 15:10:35 +00:00
parent 62b2cace20
commit 0e0690a04d
2 changed files with 36 additions and 1 deletions

View File

@ -28211,6 +28211,27 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils
#, c-format
msgid "authentication failed.\n"
msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.17/restorecond/restorecond.8
--- nsapolicycoreutils/restorecond/restorecond.8 2006-05-15 09:42:57.000000000 -0400
+++ policycoreutils-1.30.17/restorecond/restorecond.8 2006-07-18 11:11:31.000000000 -0400
@@ -11,7 +11,7 @@
.BR restorecond
program.
.P
-This daemon uses inotify to watch files listed in the /etc/selinux/POLICYTYPE/restorconfiles.conf, when they are created, this daemon will make sure they have
+This daemon uses inotify to watch files listed in the /etc/selinux/restorecond.conf, when they are created, this daemon will make sure they have
the correct file context associated with the policy.
.SH "OPTIONS"
@@ -25,7 +25,7 @@
The program was written by Dan Walsh <dwalsh@redhat.com>.
.SH "FILES"
-/etc/selinux/POLICYTYPE/restorconfiles.conf
+/etc/selinux/restorecond.conf
.SH "SEE ALSO"
.BR restorecon (8),
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2006-07-03 07:52:43.000000000 -0400
+++ policycoreutils-1.30.17/restorecond/restorecond.c 2006-07-17 09:37:26.000000000 -0400

View File

@ -5,7 +5,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.30.17
Release: 4
Release: 5
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -106,11 +106,25 @@ rm -rf %{buildroot}
%attr(755,root,root) /etc/rc.d/init.d/restorecond
%config(noreplace) /etc/selinux/restorecond.conf
%preun
if [ $1 -eq 0 ]; then
/sbin/service restorecond stop > /dev/null 2>&1
/sbin/chkconfig --del restorecond
fi
%postun
if [ $1 -ge 1 ]; then
/sbin/service restorecond condrestart > /dev/null 2>&1 || :
fi
%post
/sbin/chkconfig --add restorecond
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
* Tue Jul 18 2006 Dan Walsh <dwalsh@redhat.com> 1.30.17-5
- Fix handling of restorecond
* Mon Jul 17 2006 Dan Walsh <dwalsh@redhat.com> 1.30.17-4
- Fix creation of restorecond pidfile