Author: dwalsh
Update of /cvs/extras/rpms/xguest/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9234
Modified Files:
xguest.spec
Log Message:
* Wed Apr 28 2010 Dan Walsh <dwalsh(a)redhat.com> - 1.0.8-6
- Fix build to work on disabled machine
Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/F-13/xguest.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xguest.spec 10 Mar 2010 15:08:58 -0000 1.21
+++ xguest.spec 30 Apr 2010 19:54:49 -0000 1.22
@@ -1,7 +1,7 @@
Summary: Creates xguest user as a locked down user
Name: xguest
Version: 1.0.8
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Base
BuildArch: noarch
@@ -10,8 +10,8 @@ patch: xguest-namespace.patch
URL:
http://people.fedoraproject.org/~dwalsh/xguest/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires(pre): pam >= 0.99.8.1-17 selinux-policy > 3.6.3-12 selinux-policy-base
-Requires(pre): policycoreutils-sandbox
+Requires(post): pam >= 0.99.8.1-17 selinux-policy > 3.6.3-12 selinux-policy-base
+Requires(post): policycoreutils-sandbox
Requires(post): sabayon-apply
Requires: gdm >= 1:2.20.0-15.fc8
@@ -38,25 +38,19 @@ mounted on tmpfs.
install -m0644 xguest.zip %{buildroot}/%{_sysconfdir}/sabayon/
install -m0644 xguest.conf %{buildroot}/%{_sysconfdir}/security/namespace.d/
-%pre
+%post
if [ $1 -eq 1 ]; then
-semanage user -a -S targeted -P xguest -R xguest_r xguest_u 2> /dev/null || :
-(useradd -c "Guest" -Z xguest_u xguest || semanage login -a -S targeted -s
xguest_u xguest || semanage login -m -S targeted -s xguest_u xguest) 2>/dev/null ||
exit 1
-
+useradd -c "kiosk" xguest 2> /dev/null | :
echo "xguest:exclusive" >> /etc/security/sepermit.conf
-semanage boolean -m -S targeted -F /proc/self/fd/0 << _EOF
-allow_polyinstantiation=1
-xguest_connect_network=1
-xguest_mount_media=1
-xguest_use_bluetooth=1
+semanage -S targeted -i - << _EOF
+login -a -s xguest_u xguest
+boolean -m --on allow_polyinstantiation
+boolean -m --on xguest_connect_network
+boolean -m --on xguest_mount_media
+boolean -m --on xguest_use_bluetooth
_EOF
-fi
-
-%post
-if [ $1 -eq 1 ]; then
-
# Add two directories to /etc/skell so pam_namespace will label properly
mkdir /etc/skel/.mozilla 2> /dev/null
mkdir /etc/skel/.gnome2 2> /dev/null
@@ -88,6 +82,9 @@ __eof
fi
%changelog
+* Wed Apr 28 2010 Dan Walsh <dwalsh(a)redhat.com> - 1.0.8-6
+- Fix build to work on disabled machine
+
* Wed Mar 10 2010 Dan Walsh <dwalsh(a)redhat.com> - 1.0.8-5
- Use /proc/self/fd/0 instead of /dev/stdin