rpms/xguest/F-10 xguest.spec,1.7,1.8

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/xguest/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14469

Modified Files:
	xguest.spec 
Log Message:
* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.6-8
- Modify xguest to be able to be installed in a livecd



Index: xguest.spec
===================================================================
RCS file: /cvs/extras/rpms/xguest/F-10/xguest.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xguest.spec	4 Apr 2008 20:53:52 -0000	1.7
+++ xguest.spec	22 Jan 2009 16:23:23 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Creates xguest user as a locked down user 
 Name: xguest
 Version: 1.0.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
@@ -38,8 +38,8 @@
 
 %pre
 if [ $1 -eq 1 ]; then
-semanage user -a -P xguest -R xguest_r xguest_u  2> /dev/null
-(useradd -c "Guest" -Z xguest_u xguest || semanage login -a -s xguest_u xguest || semanage login -m -s xguest_u xguest) 2>/dev/null || exit 1
+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
 
 echo -n \
 '
@@ -53,7 +53,14 @@
 
 echo "xguest:exclusive" >> /etc/security/sepermit.conf
 
-setsebool -P allow_polyinstantiation=1 browser_confine_xguest=1 browser_write_xguest_data=1 xguest_connect_network=1 xguest_mount_media=1 xguest_use_bluetooth=1
+semanage  boolean -m -S targeted -F /dev/stdin  << _EOF
+allow_polyinstantiation=1
+browser_confine_xguest=1
+browser_write_xguest_data=1
+xguest_connect_network=1
+xguest_mount_media=1
+xguest_use_bluetooth=1
+_EOF
 
 fi
 
@@ -94,6 +101,9 @@
 fi
 
 %changelog
+* Thu Jan 22 2009 Dan Walsh <dwalsh at redhat.com> - 1.0.6-8
+- Modify xguest to be able to be installed in a livecd
+
 * Fri Apr 4 2008 Dan Walsh <dwalsh at redhat.com> - 1.0.6-7
 - Require newer version of policy