sabayon r984 - in trunk: . admin-tool

[michael svn gnome org]

Author: michael
Date: Wed Jun 25 08:00:20 2008
New Revision: 984
URL: http://svn.gnome.org/viewvc/sabayon?rev=984&view=rev

Log:
2008-06-25  Michael Meeks  <michael meeks novell com>

        * admin-tool/Makefile.am, admin-tool/sabayon-xinitrc.sh.in:
        don't spawn a whole python process / bootstrap to check for
        a single file - when we can do that in the shell script
        wrapper for free: hugely improves login performance with
        sabayon running.



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

Modified: trunk/admin-tool/Makefile.am
==============================================================================
--- trunk/admin-tool/Makefile.am	(original)
+++ trunk/admin-tool/Makefile.am	Wed Jun 25 08:00:20 2008
@@ -47,6 +47,7 @@
 %.sh: %.sh.in
 	sed                                             \
 		-e s!\ SBINDIR\@!$(sbindir)!            \
+		-e s!\ SCONFDIR\@!$(sysconfdir)!        \
 		< $< > $@
 	chmod a+x $@
 

Modified: trunk/admin-tool/sabayon-xinitrc.sh.in
==============================================================================
--- trunk/admin-tool/sabayon-xinitrc.sh.in	(original)
+++ trunk/admin-tool/sabayon-xinitrc.sh.in	Wed Jun 25 08:00:20 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 @SCONFDIR@/desktop-profiles/users.xml ]; then
+    if [ -x @SBINDIR@/sabayon-apply ] ; then
+      @SBINDIR@/sabayon-apply
+    fi
   fi
 fi