GNOME.org
 

[jhbuild] Remove the use of system D-Bus and ConsoleKit in Manual. (GNOME bug 614957)

commit d038e01eaf1f8f30f94e7bc49b8d61c330aac685
Author: Craig Keogh <cskeogh adam com au>
Date:   Sat Apr 17 10:09:54 2010 +0930

    Remove the use of system D-Bus and ConsoleKit in Manual. (GNOME bug 614957)

 doc/C/jhbuild.xml |  104 +++++++++++++++++------------------------------------
 1 files changed, 33 insertions(+), 71 deletions(-)
---
diff --git a/doc/C/jhbuild.xml b/doc/C/jhbuild.xml
index 4106f8f..172a9f4 100644
--- a/doc/C/jhbuild.xml
+++ b/doc/C/jhbuild.xml
@@ -487,10 +487,7 @@
       <section>
 	<title>Setup GNOME to run in a nested window</title>
 
-	<para>Build and install JHBuild GNOME. Then build and install
-	  <application>ConsoleKit</application>:</para>
-
-	<screen><prompt>$ </prompt><userinput>jhbuild -m gnome-external-deps-devel buildone ConsoleKit</userinput></screen>
+	<para>Build and install JHBuild GNOME.</para>
 
 	<para>Install the <application>Xephyr</application>
 	  application. On Fedora the system package is called
@@ -506,28 +503,21 @@
 	  displayed. Close the <application>Xephyr</application>
 	  window.
 	</para>
-	<para>Install the <application>sudo</application> application
-	  if not installed. Setup a <filename>/etc/sudoers</filename>
-	  file by running as <systemitem
-	    class="username">root</systemitem>:</para>
-
-	<screen><prompt># </prompt><userinput>visudo</userinput></screen>
-
-	<para>Allow the <systemitem
-	    class="username">gnomedev</systemitem> user to run the
-	  following commands as root without a password. Add the
-	  following lines replacing <filename>/opt/gnome2</filename>
-	  with GNOME install <varname>prefix</varname>:</para>
-
-	<programlisting>Cmnd_Alias  GNOME =  <replaceable>/opt/gnome2</replaceable>/bin/dbus-daemon, \
-                     <replaceable>/opt/gnome2</replaceable>/sbin/console-kit-daemon, \
-                     /usr/bin/killall <replaceable>/opt/gnome2</replaceable>/bin/dbus-daemon, \
-                     /usr/bin/killall <replaceable>/opt/gnome2</replaceable>/sbin/console-kit-daemon, \
-                     /bin/rm -f <replaceable>/opt/gnome2</replaceable>/var/run/messagebus.pid
-
-# User privilege specification
-<replaceable>gnomedev</replaceable> ALL = NOPASSWD: GNOME
-</programlisting>
+
+	<para>Enable system services. JHBuild GNOME will use the
+	<filename>/usr/bin</filename> system
+	<application>D-Bus</application> daemon and the system
+	services within
+	<filename>/usr/share/dbus-1/system-services/</filename>. JHBuild
+	GNOME will use the JHBuild session
+	<application>D-Bus</application> daemon and the services
+	within
+	<filename><replaceable>/opt/gnome2</replaceable>/share/dbus-1/services/</filename>.
+	Replace <filename>/opt/gnome2</filename> with GNOME install
+	<varname>prefix</varname> in the command below:</para>
+
+	<screen><prompt>$ </prompt><userinput>rm -rf <replaceable>/opt/gnome2</replaceable>/var/run/dbus</userinput>
+<prompt>$ </prompt><userinput>ln -s /var/run/dbus <replaceable>/opt/gnome2</replaceable>/var/run</userinput></screen>
 
 	<para>Create a GNOME startup script at
 	  <filename>~/.local/bin/gnome-jhbuild-xephyr-session</filename> 
@@ -543,14 +533,8 @@ GDK_USE_XFT=1
 XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share
 XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg
 
-sudo /bin/rm -f /opt/gnome2/var/run/messagebus.pid
-sudo $GNOME/bin/dbus-daemon --system
-sudo $GNOME/sbin/console-kit-daemon
-
 jhbuild run gnome-session
-
-sudo /usr/bin/killall $GNOME/sbin/console-kit-daemon
-sudo /usr/bin/killall $GNOME/bin/dbus-daemon</programlisting>
+</programlisting>
 
 	<para>Make the file
 	  <filename>~/.local/bin/gnome-jhbuild-xephyr-session</filename> 
@@ -571,41 +555,25 @@ sudo /usr/bin/killall $GNOME/bin/dbus-daemon</programlisting>
 
 	<para>If successful, JHBuild GNOME will be displayed in Xephyr window. If unsuccessful, check the output of the terminal window.</para>
       </section>
-      <section><title>Setup GNOME to run from the display manager</title>
-
-	<para>Build and install JHBuild GNOME. Then build and install
-	  <application>ConsoleKit</application>:</para>
-
-	<screen><prompt>$ </prompt><userinput>jhbuild -m gnome-external-deps-devel buildone ConsoleKit</userinput></screen>
 
-	<para>Install the <application>sudo</application> application
-	  if not installed. Setup a <filename>/etc/sudoers</filename>
-	  file by running as <systemitem
-	    class="username">root</systemitem>:</para>
+      <section><title>Setup GNOME to run from the display manager</title>
 
-	<screen><prompt># </prompt><userinput>visudo</userinput></screen>
+	<para>Build and install JHBuild GNOME.</para>
 
-	<para>Allow the <systemitem
-	    class="username">gnomedev</systemitem> user to run the
-	  following commands as root without a password. Ensure
-	  <varname>requiretty</varname> is not set or commented out,
-	  otherwise <command>sudo</command> will fail at login. Add
-	  the following lines replacing
-	  <filename>/opt/gnome2</filename> with GNOME install
-	  <varname>prefix</varname>:</para>
+	<para>Enable system services. JHBuild GNOME will use the
+	<filename>/usr/bin</filename> system
+	<application>D-Bus</application> daemon and the system
+	services within
+	<filename>/usr/share/dbus-1/system-services/</filename>. JHBuild
+	GNOME will use the JHBuild session
+	<application>D-Bus</application> daemon and the services
+	within
+	<filename><replaceable>/opt/gnome2</replaceable>/share/dbus-1/services/</filename>.
+	Replace <filename>/opt/gnome2</filename> with GNOME install
+	<varname>prefix</varname> in the command below:</para>
 
-	<programlisting>Cmnd_Alias  GNOME =  <replaceable>/opt/gnome2</replaceable>/bin/dbus-daemon, \
-                     <replaceable>/opt/gnome2</replaceable>/sbin/console-kit-daemon, \
-                     /usr/bin/killall <replaceable>/opt/gnome2</replaceable>/bin/dbus-daemon, \
-                     /usr/bin/killall <replaceable>/opt/gnome2</replaceable>/sbin/console-kit-daemon, \
-                     /bin/rm -f <replaceable>/opt/gnome2</replaceable>/var/run/messagebus.pid
-
-# Defaults specification
-# Defaults    requiretty
-
-# User privilege specification
-<replaceable>gnomedev</replaceable> ALL = NOPASSWD: GNOME
-</programlisting>
+	<screen><prompt>$ </prompt><userinput>rm -rf <replaceable>/opt/gnome2</replaceable>/var/run/dbus</userinput>
+<prompt>$ </prompt><userinput>ln -s /var/run/dbus <replaceable>/opt/gnome2</replaceable>/var/run</userinput></screen>
 
 	<para>Create a GNOME startup script at
 	  <filename>/usr/bin/gnome-jhbuild-session</filename> 
@@ -621,14 +589,8 @@ GDK_USE_XFT=1
 XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME/share
 XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$GNOME/etc/xdg
 
-sudo /bin/rm -f /opt/gnome2/var/run/messagebus.pid
-sudo $GNOME/bin/dbus-daemon --system
-sudo $GNOME/sbin/console-kit-daemon
-
 jhbuild run gnome-session
-
-sudo /usr/bin/killall $GNOME/sbin/console-kit-daemon
-sudo /usr/bin/killall $GNOME/bin/dbus-daemon</programlisting>
+</programlisting>
 
 	<para>Make the file
 	  <filename>/usr/bin/gnome-jhbuild-session</filename>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]