[freenx-server] - Fix incorrect service start status when restorecon doesn't exist.

Ville Skyttä scop at fedoraproject.org
Thu Jan 13 18:37:21 UTC 2011


commit f3b714e9454200279029dd66038136db2dda6ed5
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Jan 13 20:37:09 2011 +0200

    - Fix incorrect service start status when restorecon doesn't exist.

 freenx-server.spec |    5 ++++-
 restorecon.patch   |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/freenx-server.spec b/freenx-server.spec
index 23f4a8a..eb73e75 100644
--- a/freenx-server.spec
+++ b/freenx-server.spec
@@ -7,7 +7,7 @@
 Summary: Free Software (GPL) Implementation of the NX Server
 Name: freenx-server
 Version: 0.7.3
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://freenx.berlios.de/
@@ -129,6 +129,9 @@ fi
 %{_sysconfdir}/init.d/freenx-server
 
 %changelog
+* Thu Jan 13 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-20
+- Fix incorrect service start status when restorecon doesn't exist.
+
 * Wed Jul 21 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-19
 - Apply improvements from Fedora bug #616993:
 - Install nxkeygen and nxsetup symlinks in /usr/sbin.
diff --git a/restorecon.patch b/restorecon.patch
index 5a2b59d..c8cbb31 100644
--- a/restorecon.patch
+++ b/restorecon.patch
@@ -4,7 +4,7 @@
  	runuser -s /bin/bash - nx -c "$PATH_BIN/nxserver --cleanup" > /dev/null 2>&1 < /dev/null
  	if [ ! -d "/tmp/.X11-unix" ]; then
  	  mkdir -m1777 /tmp/.X11-unix/
-+	  [ -x /sbin/restorecon ] && /sbin/restorecon /tmp/.X11-unix
++	  [ ! -x /sbin/restorecon ] || /sbin/restorecon /tmp/.X11-unix
  	  ret=$?
  	else
  	  X11_owner=`/bin/ls -ald /tmp/.X11-unix | /bin/gawk {'print $3'}`


More information about the scm-commits mailing list