sabayon r979 - in tags/SABAYON_2_22_0: . admin-tool

[federico svn gnome org]

Author: federico
Date: Mon May 19 17:00:01 2008
New Revision: 979
URL: http://svn.gnome.org/viewvc/sabayon?rev=979&view=rev

Log:
bnc384840 - Don't run sabayon-apply at login if this machine is not sabayon-controlled
2008-05-19  Michael Meeks  <michael meeks novell com>

	https://bugzilla.novell.com/show_bug.cgi?id=384840

	* admin-tool/sabayon-xinitrc.sh.in: Before launching
	sabayon-apply, check if users.xml exists.  If it doesn't (i.e.
	this machine doesn't use Sabayon), we can avoid loading the entire
	Python stack at login time.

	* admin-tool/Makefile.am (%.sh): Substitute @SCONFDIR@ as well in
	the sed rule for the xinitrc script.

Signed-off-by: Federico Mena Quintero <federico novell com>


Modified:
   tags/SABAYON_2_22_0/ChangeLog
   tags/SABAYON_2_22_0/admin-tool/Makefile.am
   tags/SABAYON_2_22_0/admin-tool/sabayon-xinitrc.sh.in

Modified: tags/SABAYON_2_22_0/admin-tool/Makefile.am
==============================================================================
--- tags/SABAYON_2_22_0/admin-tool/Makefile.am	(original)
+++ tags/SABAYON_2_22_0/admin-tool/Makefile.am	Mon May 19 17:00:01 2008
@@ -47,6 +47,7 @@
 %.sh: %.sh.in
 	sed                                             \
 		-e s!\ SBINDIR\@!$(sbindir)!            \
+		-e s!\ SYSCONFDIR\@!$(sysconfdir)!      \
 		< $< > $@
 	chmod a+x $@
 

Modified: tags/SABAYON_2_22_0/admin-tool/sabayon-xinitrc.sh.in
==============================================================================
--- tags/SABAYON_2_22_0/admin-tool/sabayon-xinitrc.sh.in	(original)
+++ tags/SABAYON_2_22_0/admin-tool/sabayon-xinitrc.sh.in	Mon May 19 17:00:01 2008
@@ -5,7 +5,10 @@
 #
 
 if [ "x$DISABLE_SABAYON_XINITRC" = "x" ] ; then
-  if [ -x @SBINDIR@/sabayon-apply ] ; then
-    @SBINDIR@/sabayon-apply
+  # ensure we do no work if there are no profiles to apply
+  if [ -f @SYSCONFDIR@/desktop-profiles/users.xml ]; then
+    if [ -x @SBINDIR@/sabayon-apply ] ; then
+      @SBINDIR@/sabayon-apply
+    fi
   fi
 fi