[xguest] Change xguest homedir to be /var/lib/xguest/home/xguest
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Dec 7 16:09:52 UTC 2011
commit afcc0338ed466ccc37e21708e4cf6f84146c635c
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Dec 7 11:09:44 2011 -0500
Change xguest homedir to be /var/lib/xguest/home/xguest
xguest.spec | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/xguest.spec b/xguest.spec
index 6a4cae6..8ad0889 100644
--- a/xguest.spec
+++ b/xguest.spec
@@ -1,7 +1,7 @@
Summary: Creates xguest user as a locked down user
Name: xguest
Version: 1.0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
BuildArch: noarch
@@ -37,11 +37,10 @@ mounted on tmpfs.
install -m0644 xguest.zip %{buildroot}/%{_sysconfdir}/sabayon/profiles/
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 || :
-mkdir -p /var/lib/xguest
-(useradd -c "Guest" -Z xguest_u -d /var/lib/xguest/home 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 "Guest" -Z xguest_u -d /var/lib/xguest/home/xguest 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 "xguest:exclusive" >> /etc/security/sepermit.conf
@@ -52,11 +51,6 @@ 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
@@ -74,8 +68,8 @@ fi
%config(noreplace) %{_sysconfdir}/sabayon/profiles/xguest.zip
%{_sysconfdir}/security/namespace.d/
%doc README LICENSE
-/var/lib/xguest/home
-/var/lib/xguest
+%dir /var/lib/xguest/home
+%dir /var/lib/xguest
%preun
if [ $1 -eq 0 ]; then
@@ -90,6 +84,9 @@ __eof
fi
%changelog
+* Wed Dec 7 2011 Dan Walsh <dwalsh at redhat.com> - 1.0.10-2
+- Change xguest homedir to be /var/lib/xguest/home/xguest
+
* Fri Sep 23 2011 Dan Walsh <dwalsh at redhat.com> - 1.0.10-1
- Make sure none of the gpk apps start on the desktop
More information about the scm-commits
mailing list