* Thu Jun 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-28
- Fix sandbox init script - Add dbus-launch to sandbox -X Resolve: #599599
This commit is contained in:
parent
9ff9a87a26
commit
70b2ff10d0
@ -1595,7 +1595,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||||||
+relabel:
|
+relabel:
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.82/sandbox/sandbox
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox policycoreutils-2.0.82/sandbox/sandbox
|
||||||
--- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/sandbox/sandbox 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.82/sandbox/sandbox 2010-06-03 11:03:16.000000000 -0400
|
+++ policycoreutils-2.0.82/sandbox/sandbox 2010-06-03 16:30:17.000000000 -0400
|
||||||
@@ -0,0 +1,427 @@
|
@@ -0,0 +1,427 @@
|
||||||
+#! /usr/bin/python -E
|
+#! /usr/bin/python -E
|
||||||
+# Authors: Dan Walsh <dwalsh@redhat.com>
|
+# Authors: Dan Walsh <dwalsh@redhat.com>
|
||||||
@ -1827,7 +1827,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||||||
+/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
|
+/usr/bin/test -r ~/.xmodmap && /usr/bin/xmodmap ~/.xmodmap
|
||||||
+%s &
|
+%s &
|
||||||
+WM_PID=$!
|
+WM_PID=$!
|
||||||
+%s
|
+dbus-launch %s
|
||||||
+kill -TERM $WM_PID 2> /dev/null
|
+kill -TERM $WM_PID 2> /dev/null
|
||||||
+""" % (command, wm, command))
|
+""" % (command, wm, command))
|
||||||
+ fd.close()
|
+ fd.close()
|
||||||
@ -2100,8 +2100,8 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||||||
+HOMEDIRS="/home"
|
+HOMEDIRS="/home"
|
||||||
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.init policycoreutils-2.0.82/sandbox/sandbox.init
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/sandbox/sandbox.init policycoreutils-2.0.82/sandbox/sandbox.init
|
||||||
--- nsapolicycoreutils/sandbox/sandbox.init 1969-12-31 19:00:00.000000000 -0500
|
--- nsapolicycoreutils/sandbox/sandbox.init 1969-12-31 19:00:00.000000000 -0500
|
||||||
+++ policycoreutils-2.0.82/sandbox/sandbox.init 2010-05-19 10:24:59.000000000 -0400
|
+++ policycoreutils-2.0.82/sandbox/sandbox.init 2010-06-03 17:11:59.000000000 -0400
|
||||||
@@ -0,0 +1,74 @@
|
@@ -0,0 +1,72 @@
|
||||||
+#!/bin/bash
|
+#!/bin/bash
|
||||||
+## BEGIN INIT INFO
|
+## BEGIN INIT INFO
|
||||||
+# Provides: sandbox
|
+# Provides: sandbox
|
||||||
@ -2139,8 +2139,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||||||
+base=${0##*/}
|
+base=${0##*/}
|
||||||
+
|
+
|
||||||
+case "$1" in
|
+case "$1" in
|
||||||
+ restart)
|
+ restart | start)
|
||||||
+ start)
|
|
||||||
+ [ -f "$LOCKFILE" ] && exit 0
|
+ [ -f "$LOCKFILE" ] && exit 0
|
||||||
+
|
+
|
||||||
+ touch $LOCKFILE
|
+ touch $LOCKFILE
|
||||||
@ -2170,7 +2169,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po
|
|||||||
+ rm -f $LOCKFILE
|
+ rm -f $LOCKFILE
|
||||||
+ exit 0
|
+ exit 0
|
||||||
+ ;;
|
+ ;;
|
||||||
+
|
|
||||||
+ *)
|
+ *)
|
||||||
+ echo $"Usage: $0 {start|stop|status|restart}"
|
+ echo $"Usage: $0 {start|stop|status|restart}"
|
||||||
+ exit 3
|
+ exit 3
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
Summary: SELinux policy core utilities
|
Summary: SELinux policy core utilities
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 2.0.82
|
Version: 2.0.82
|
||||||
Release: 26%{?dist}
|
Release: 28%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||||
@ -313,6 +313,11 @@ fi
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-28
|
||||||
|
- Fix sandbox init script
|
||||||
|
- Add dbus-launch to sandbox -X
|
||||||
|
Resolve: #599599
|
||||||
|
|
||||||
* Thu Jun 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-27
|
* Thu Jun 3 2010 Dan Walsh <dwalsh@redhat.com> 2.0.82-27
|
||||||
- Move genhomedircon.8 to same package as genhomedircon
|
- Move genhomedircon.8 to same package as genhomedircon
|
||||||
- Fix sandbox to pass unit test
|
- Fix sandbox to pass unit test
|
||||||
|
Loading…
Reference in New Issue
Block a user