commit uxlaunch for openSUSE:Factory

Hello community, here is the log from the commit of package uxlaunch for openSUSE:Factory checked in at Fri Mar 19 10:42:37 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/uxlaunch/uxlaunch.changes 2010-03-18 12:25:29.000000000 +0100 @@ -0,0 +1,103 @@ +------------------------------------------------------------------- +Thu Mar 18 11:26:06 UTC 2010 - awafaa@opensuse.org + +- Fix man pages installation issue + +------------------------------------------------------------------- +Wed Mar 17 17:08:06 UTC 2010 - awafaa@opensuse.org + +- Change group to System/GUI/Other. Remove patch + uxlaunch-shutdown-gconfd.patch from >11.2 + +------------------------------------------------------------------- +Tue Feb 2 06:54:53 UTC 2010 - glin@novell.com + +- Set SDL_AUDIODRIVER=pulse to fix bnc#573381 + +------------------------------------------------------------------- +Mon Feb 1 10:24:35 UTC 2010 - glin@novell.com + +- Respin export-extra-env.patch to add two env variables: + WINDOWMANAGER and PATH. bnc#571380 + +------------------------------------------------------------------- +Fri Jan 29 15:49:02 GMT 2010 - michael.meeks@novell.com + +- Add uxlaunch-myzone-speed.patch: allow the myzone to get a + couple of seconds of uninterrupted CPU under it's belt. + +------------------------------------------------------------------- +Tue Nov 10 01:51:21 UTC 2009 - glin@novell.com + +- Update to 0.22.5 +- Added uxlaunch-rename-panel-internet-to-web.patch to rename the + moblin-panel-internet to moblin-panel-web in desktop.c + +------------------------------------------------------------------- +Tue Oct 27 12:52:24 UTC 2009 - tambet@novell.com + +- Improve the uxlaunch-shutdown-gconfd.patch to use gconftool-2 to + shut down gconfd. + +------------------------------------------------------------------- +Tue Oct 27 06:02:08 UTC 2009 - glin@novell.com + +- Add uxlaunch-shutdown-gconfd.patch to save gconf keys before shutdown + bnc#549522 + +------------------------------------------------------------------- +Tue Oct 13 09:55:10 UTC 2009 - glin@novell.com + +- Respin export-extra-env.patch to add ALSA_CONFIG_PATH. bnc#533225 + +------------------------------------------------------------------- +Fri Sep 18 07:56:39 UTC 2009 - awafaa@opensuse.org + +- Add uxlaunch-user.diff to remove the hard dependency on user "linux" + +------------------------------------------------------------------- +Sun Aug 30 15:47:04 UTC 2009 - abockover@novell.com + +- Export MOZ_PLUGIN_PATH and SSH_ASKPASS in user.c: bnc#534690 +- Fix two rpmlint warnings (suse_update_desktop_file, and make + /var/adm/fillup-templates/sysconfig.uxlaunch not executable) + +------------------------------------------------------------------- +Mon Aug 17 14:31:21 BST 2009 - michael.meeks@novell.com + +- add xmodmap calls to startmoblin, and remove --sync option for mutter. + +------------------------------------------------------------------- +Sat Aug 15 09:08:54 BST 2009 - michael.meeks@novell.com + +- Remove the system / init-script approach, and add a patch + to allow uxlaunch to replace moblin-session. + +------------------------------------------------------------------- +Wed Aug 12 21:03:49 BST 2009 - michael.meeks@novell.com + +- create an /etc/init.d/earlyux script - you need to set + DISPLAYMANAGER=console in /etc/sysconfig/displaymanager + to avoid xdm conflicting with this +- create /usr/sbin/moblin-uxlaunch to setup some shell + scripty things, and re-start uxlaunch as/when/if it + crashes. +- we really also require a fix in ConsoleKit's + /etc/dbus-1/.../ConsoleKit.conf + +------------------------------------------------------------------- +Wed Aug 12 16:38:34 BST 2009 - michael.meeks@novell.com + +- set the default configuration to match our system. + +------------------------------------------------------------------- +Tue Aug 11 12:16:05 BST 2009 - michael.meeks@novell.com + +- Fix PAM authentication callback issue +- Fix hard-coded libexec path problem + +------------------------------------------------------------------- +Mon Aug 10 20:23:44 BST 2009 - michael.meeks@novell.com + +- Package initial version from git. + calling whatdependson for head-i586 New: ---- 0001-Make-PAM-happy-on-chattier-SUSE.patch 0002-Allow-the-mutter-libexec-path-to-be-configured-at-co.patch export-extra-env.patch moblin.desktop startmoblin uxlaunch-0.22.5.tar.bz2 uxlaunch.changes uxlaunch-myzone-speed.patch uxlaunch-rename-panel-internet-to-web.patch uxlaunch-session-split.patch uxlaunch-set-sdl-audiodriver.patch uxlaunch-shutdown-gconfd.patch uxlaunch.spec uxlaunch-suse.patch uxlaunch-user.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uxlaunch.spec ++++++ # # spec file for package uxlaunch (Version 0.22.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: uxlaunch Version: 0.22.5 Release: 1 License: GPLv2 Summary: A hugely cut-down gdm and gnome-session replacement Group: System/GUI/Other Url: http://www.moblin.org/ Source0: %{name}-%{version}.tar.bz2 #Source1: init.earlyux #Source2: moblin-uxlaunch Source3: moblin.desktop Source4: startmoblin Patch0: 0001-Make-PAM-happy-on-chattier-SUSE.patch Patch1: 0002-Allow-the-mutter-libexec-path-to-be-configured-at-co.patch Patch2: uxlaunch-suse.patch Patch3: uxlaunch-session-split.patch Patch4: export-extra-env.patch Patch5: uxlaunch-user.diff Patch6: uxlaunch-shutdown-gconfd.patch Patch7: uxlaunch-rename-panel-internet-to-web.patch Patch8: uxlaunch-myzone-speed.patch Patch9: uxlaunch-set-sdl-audiodriver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel glib2-devel xorg-x11-libXau-devel BuildRequires: ConsoleKit-devel pam-devel BuildRequires: update-desktop-files PreReq: %fillup_prereq Conflicts: moblin-session %description An ultra-lightweight, but non-standard process to log you in, and get your session going in next to no cycles. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %if 0%{?suse_version} <= 1120 %patch6 -p1 %endif %patch7 -p1 %patch8 -p0 %patch9 -p1 %build export CFLAGS=$RPM_OPT_FLAGS %__make %{?jobs:-j%jobs} mutterlibexecdir=/usr/lib/mutter-moblin %install %makeinstall mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mv $RPM_BUILD_ROOT/etc/sysconfig/uxlaunch $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.uxlaunch chmod -x $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.uxlaunch # To use this as a user session launcher mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions install -m 644 %{S:3} $RPM_BUILD_ROOT%{_datadir}/xsessions/moblin.desktop %suse_update_desktop_file $RPM_BUILD_ROOT%{_datadir}/xsessions/moblin.desktop install -m 755 %{S:4} $RPM_BUILD_ROOT%{_bindir}/startmoblin # For using this as a gdm replacement: # install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/ # mkdir -p $RPM_BUILD_ROOT/etc/init.d # install -m 755 %{S:1} $RPM_BUILD_ROOT/etc/init.d/earlyux find %{buildroot}%{_mandir} -type f -print0 | xargs -r0 chmod a-x %clean rm -rf $RPM_BUILD_ROOT %post %{fillup_only -n uxlaunch} # If used as a gdm replacement: # {fillup_and_insserv -nY uxlaunch earlyux} # postun # {insserv_cleanup} %files %defattr(-,root,root,-) /usr/sbin/uxlaunch %{_bindir}/startmoblin %{_datadir}/xsessions/moblin.desktop /var/adm/fillup-templates/sysconfig.uxlaunch %{_mandir}/man1/uxlaunch.1.gz # /usr/sbin/moblin-uxlaunch # /etc/init.d/earlyux %changelog ++++++ 0001-Make-PAM-happy-on-chattier-SUSE.patch ++++++

From 81f58edfb8e0145a34011b0270669b2d0a122e7c Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 11 Aug 2009 11:53:10 +0100 Subject: [PATCH] Make PAM happy on (chattier) SUSE.

--- options.c | 6 +++--- pam.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/options.c b/options.c index fbc38e6..49a7245 100644 --- a/options.c +++ b/options.c @@ -174,8 +174,8 @@ void get_options(int argc, char **argv) lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session); pass = getpwnam(username); - if (!pass) + if (!pass) { + lprintf("Error: can't find user \"%s\"", username); exit(EXIT_FAILURE); - - + } } diff --git a/pam.c b/pam.c index 65855bf..7b9881b 100644 --- a/pam.c +++ b/pam.c @@ -5,6 +5,7 @@ * Authors: * Auke Kok * Arjan van de Ven + * Michael Meeks * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,6 +26,48 @@ pam_handle_t *ph; struct pam_conv pc; /* + * Sometimes PAM likes to chat with you, before it is assured + * enough to let you log-in: fun. + */ +static int +pam_conversation_fn (int msg_count, + const struct pam_message **messages, + struct pam_response **responses, + void *user_data) +{ + int i; + (void)user_data; + + lprintf ("pam conversation with %d messages", msg_count); + if (responses) + *responses = NULL; + + if (msg_count < 1) /* ping */ + return PAM_SUCCESS; + + /* otherwise find any helpful data we can to print, and bail */ + if (!responses || !messages) { + lprintf ("pam conversation with no message, or response"); + return PAM_CONV_ERR; + } + *responses = calloc (msg_count, sizeof (struct pam_response)); + for (i = 0; i < msg_count; i++) { + const struct pam_message *msg = messages[i]; + + if (msg->msg_style == PAM_TEXT_INFO) + lprintf ("pam chats to us: '%s'", msg->msg); + else if (msg->msg_style == PAM_ERROR_MSG) + lprintf ("Error: pam error msg '%s'", msg->msg); + else + lprintf ("pam message %d style %d: '%s'", + i, msg->msg_style, msg->msg); + (*responses)[i].resp = NULL; + (*responses)[i].resp_retcode = PAM_SUCCESS; + } + return PAM_SUCCESS; +} + +/* * Creating a PAM session. We need a pam "login" session so that the dbus * "at_console" logic will work correctly, as well as various /dev file * permissions. @@ -40,6 +83,9 @@ void setup_pam_session(void) snprintf(x, 256, "tty%d", tty); + pc.conv = pam_conversation_fn; + pc.appdata_ptr = NULL; + err = pam_start("login", pass->pw_name, &pc, &ph); err = pam_set_item(ph, PAM_TTY, &x); -- 1.6.0.2 ++++++ 0002-Allow-the-mutter-libexec-path-to-be-configured-at-co.patch ++++++

From 1ce5af2971371f3bc7df488aa82e1c7e7b821407 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 11 Aug 2009 12:13:53 +0100 Subject: [PATCH] Allow the mutter libexec path to be configured at compile time

--- Makefile | 5 ++++- desktop.c | 14 +++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) Index: uxlaunch-0.22.5/Makefile =================================================================== --- uxlaunch-0.22.5.orig/Makefile +++ uxlaunch-0.22.5/Makefile @@ -13,11 +13,14 @@ install: uxlaunch install uxlaunch.sysconfig $(DESTDIR)/etc/sysconfig/uxlaunch install uxlaunch.1 $(DESTDIR)/usr/share/man/man1/uxlaunch.1 +mutterlibexecdir = "/usr/libexec" + OBJS := uxlaunch.o consolekit.o dbus.o desktop.o misc.o pam.o user.o xserver.o \ lib.o options.o oom_adj.o CFLAGS += -Wall -W -Os -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -fno-common \ -Wimplicit-function-declaration -Wimplicit-int \ + -DMUTTER_LIBEXECDIR=\""$(mutterlibexecdir)"\" \ `pkg-config --cflags dbus-1` \ `pkg-config --cflags ck-connector` \ `pkg-config --cflags glib-2.0` \ @@ -30,7 +33,7 @@ LDADD += `pkg-config --libs dbus-1` \ %.o: %.c uxlaunch.h Makefile @echo " CC $<" - @$(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< uxlaunch: $(OBJS) Makefile @echo " LD $@" Index: uxlaunch-0.22.5/desktop.c =================================================================== --- uxlaunch-0.22.5.orig/desktop.c +++ uxlaunch-0.22.5/desktop.c @@ -166,13 +166,13 @@ void autostart_panels(void) if (!strstr(session, "mutter")) return; - desktop_entry_add("/usr/libexec/moblin-panel-myzone", -1); - desktop_entry_add("/usr/libexec/moblin-panel-status", 0); - desktop_entry_add("/usr/libexec/moblin-panel-people", 0); - desktop_entry_add("/usr/libexec/moblin-panel-internet", 0); - desktop_entry_add("/usr/libexec/moblin-panel-media", 1); - desktop_entry_add("/usr/libexec/moblin-panel-pasteboard", 0); - desktop_entry_add("/usr/libexec/moblin-panel-applications", 1); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-myzone", -1); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-status", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-people", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-internet", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-media", 1); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-pasteboard", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-applications", 1); } ++++++ export-extra-env.patch ++++++ Index: uxlaunch-0.22.5/user.c =================================================================== --- uxlaunch-0.22.5.orig/user.c +++ uxlaunch-0.22.5/user.c @@ -173,4 +173,12 @@ void setup_user_environment (void) snprintf(buf, PATH_MAX, "%s/.config", pass->pw_dir); setenv("XDG_CONFIG_HOME", buf, 0); setenv("OOO_FORCE_DESKTOP","gnome", 0); + setenv("MOZ_PLUGIN_PATH", ":/usr/lib/browser-plugins", 0); + setenv("SSH_ASKPASS", "/usr/lib/ssh/x11-ssh-askpass", 0); + setenv("ALSA_CONFIG_PATH", "/etc/alsa-pulse.conf", 0); + setenv("WINDOWMANAGER", "startmoblin", 0); + snprintf(buf, PATH_MAX, "%s/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:" + "/usr/X11R6/bin:/usr/games:/usr/lib/jvm/jre/bin:/usr/lib/mit/bin:" + "/usr/lib/mit/sbin:.", pass->pw_dir); + setenv("PATH", buf, 1); } ++++++ moblin.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Type=XSession Exec=startmoblin TryExec=startmoblin Name=Moblin User Experience Comment=Moblin User Experience ++++++ startmoblin ++++++ #!/bin/sh export XDG_MENU_PREFIX=moblin- export XDG_DATA_DIRS=$HOME/.local/share/applications:/usr/share # load modmap settings test -r /etc/X11/Xmodmap && xmodmap /etc/X11/Xmodmap test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap exec /usr/sbin/uxlaunch -x ++++++ uxlaunch-myzone-speed.patch ++++++ --- desktop.c +++ desktop.c @@ -337,8 +337,11 @@ while (ptrs[count] && count < 255) ptrs[++count] = strtok(NULL, " \t"); - usleep(delay); + /* give myzone a couple of seconds of un-interrupted grace */ + if (entry->prio >= 0) + delay += 2000000; + usleep(delay); lprintf("Starting %s with prio %d at %d", entry->exec, entry->prio, delay); execvp(ptrs[0], ptrs); exit(ret); } ++++++ uxlaunch-rename-panel-internet-to-web.patch ++++++ Index: uxlaunch-0.22.5/desktop.c =================================================================== --- uxlaunch-0.22.5.orig/desktop.c +++ uxlaunch-0.22.5/desktop.c @@ -171,7 +171,7 @@ void autostart_panels(void) desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-myzone", -1); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-status", 0); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-people", 0); - desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-internet", 0); + desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-web", 0); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-media", 1); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-pasteboard", 0); desktop_entry_add(MUTTER_LIBEXECDIR "/moblin-panel-applications", 1); ++++++ uxlaunch-session-split.patch ++++++ Index: uxlaunch-0.22.5/desktop.c =================================================================== --- uxlaunch-0.22.5.orig/desktop.c +++ uxlaunch-0.22.5/desktop.c @@ -17,8 +17,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -372,9 +374,28 @@ void start_desktop_session(void) while (ptrs[count] && count < 255) ptrs[++count] = strtok(NULL, " \t"); + lprintf("Exec session '%s'", session); ret = execv(ptrs[0], ptrs); if (ret != EXIT_SUCCESS) lprintf("Failed to start %s", session); } +void wait_for_session_exit(void) +{ + lprintf("wait_for_session_exit"); + for (;;) { + errno = 0; + if (waitpid (session_pid, NULL, 0) < 0) { + if (errno == EINTR) { + continue; + } else if (errno == ECHILD) + break; /* child already reaped */ + else + lprintf("waidpid error '%s'", strerror (errno)); + } + break; + } + + lprintf("session exited"); +} Index: uxlaunch-0.22.5/lib.c =================================================================== --- uxlaunch-0.22.5.orig/lib.c +++ uxlaunch-0.22.5/lib.c @@ -24,8 +24,6 @@ #include "uxlaunch.h" -#define LOGFILE "/var/log/uxlaunch.log" - extern char **environ; static int first_time = 1; @@ -36,10 +34,13 @@ struct timeval start; static FILE *log; -void open_log(void) +void open_log(const char *logfile) { /* truncate log */ - log = fopen(LOGFILE, "w"); + if (!logfile) + log = stdout; + else + log = fopen(logfile, "w"); if (!log) logfile_enabled = 0; } Index: uxlaunch-0.22.5/options.c =================================================================== --- uxlaunch-0.22.5.orig/options.c +++ uxlaunch-0.22.5/options.c @@ -29,6 +29,7 @@ char session[256] = "/usr/bin/mutter --s char username[256] = "moblin"; int verbose = 0; +int x_session_only = 0; static struct option opts[] = { { "user", 1, NULL, 'u' }, @@ -46,6 +47,7 @@ void usage(const char *name) printf(" -u, --user Start session as specific username\n"); printf(" -t, --tty Start session on alternative tty number\n"); printf(" -s, --session Start a non-default session\n"); + printf(" -x, --xsession Start X apps inside an existing X session\n"); printf(" -v, --verbose Display lots of output to the console\n"); printf(" -h, --help Display this help message\n"); } @@ -132,7 +134,7 @@ void get_options(int argc, char **argv) /* parse cmdline - overrides */ while (1) { - c = getopt_long(argc, argv, "u:t:s:hv", opts, &i); + c = getopt_long(argc, argv, "u:t:s:hvx", opts, &i); if (c == -1) break; @@ -153,6 +155,9 @@ void get_options(int argc, char **argv) case 'v': verbose = 1; break; + case 'x': + x_session_only = 1; + break; default: break; } @@ -170,7 +175,9 @@ void get_options(int argc, char **argv) } } - lprintf("uxlaunch v%s started.", VERSION); + open_log(!x_session_only ? LOGFILE : NULL); + + lprintf("uxlaunch v%s started%s.", VERSION, x_session_only ? " for x session only" : "" ); lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session); pass = getpwnam(username); Index: uxlaunch-0.22.5/user.c =================================================================== --- uxlaunch-0.22.5.orig/user.c +++ uxlaunch-0.22.5/user.c @@ -78,12 +78,6 @@ void switch_to_user(void) setenv("PATH", buf, 1); snprintf(user_xauth_path, PATH_MAX, "%s/.Xauthority", pass->pw_dir); setenv("XAUTHORITY", user_xauth_path, 1); - snprintf(buf, PATH_MAX, "%s/.cache", pass->pw_dir); - mkdir(buf, 0700); - setenv("XDG_CACHE_HOME", buf, 0); - snprintf(buf, PATH_MAX, "%s/.config", pass->pw_dir); - setenv("XDG_CONFIG_HOME", buf, 0); - setenv("OOO_FORCE_DESKTOP","gnome", 0); set_i18n(); @@ -143,10 +137,6 @@ void set_i18n(void) * and other user stuff we don't care for now */ if (!strcmp(key, "LANG")) { setenv(key, val, 1); - if (strstr(val, "zh_")) { - setenv("GTK_IM_MODULE", "scim-bridge", 0); - setenv("CLUTTER_IM_MODULE","scim-bridge", 0); - } } if (!strcmp(key, "SYSFONT")) setenv(key, val, 1); @@ -156,3 +146,31 @@ void set_i18n(void) log_environment(); } + +void setup_user_environment (void) +{ + int i; + char buf[PATH_MAX]; + const char *lang; + static const char *scim_langs[] = { + "zh_", "ko_", "ja_", NULL + }; + + /* launch scim only where it makes sense */ + lang = getenv ("LANG"); + for (i = 0; lang && scim_langs[i]; i++) { + if (strstr (lang, scim_langs[i])) { + setenv("GTK_IM_MODULE", "scim-bridge", 0); + setenv("CLUTTER_IM_MODULE","scim-bridge", 0); + break; + } + } + + /* setup misc. user directories and variables */ + snprintf(buf, PATH_MAX, "%s/.cache", pass->pw_dir); + mkdir(buf, 0700); + setenv("XDG_CACHE_HOME", buf, 0); + snprintf(buf, PATH_MAX, "%s/.config", pass->pw_dir); + setenv("XDG_CONFIG_HOME", buf, 0); + setenv("OOO_FORCE_DESKTOP","gnome", 0); +} Index: uxlaunch-0.22.5/uxlaunch.c =================================================================== --- uxlaunch-0.22.5.orig/uxlaunch.c +++ uxlaunch-0.22.5/uxlaunch.c @@ -19,11 +19,37 @@ #include "uxlaunch.h" +/* + * Launch apps that form the user's X session + */ +static void +launch_user_session(void) +{ + setup_user_environment (); + + start_ssh_agent(); + + /* dbus needs the CK env var */ + if (!x_session_only) + setup_consolekit_session(); + + start_dbus_session_bus(); + + /* gconf needs dbus */ + start_gconf(); + + maybe_start_screensaver(); + + start_desktop_session(); + + get_session_type(); + autostart_panels(); + autostart_desktop_files(); + do_autostart(); +} int main(int argc, char **argv) { - open_log(); - /* * General objective: * Do the things that need root privs first, @@ -49,6 +75,13 @@ int main(int argc, char **argv) */ get_options(argc, argv); + + if (x_session_only) { + launch_user_session(); + wait_for_session_exit(); + return 0; + } + set_tty(); start_oom_task(); @@ -69,24 +102,7 @@ int main(int argc, char **argv) wait_for_X_signal(); - start_ssh_agent(); - - setup_consolekit_session(); - - /* dbus needs the CK env var */ - start_dbus_session_bus(); - - /* gconf needs dbus */ - start_gconf(); - - maybe_start_screensaver(); - - start_desktop_session(); - - get_session_type(); - autostart_panels(); - autostart_desktop_files(); - do_autostart(); + launch_user_session(); /* * we do this now to make sure dbus etc are not spawning Index: uxlaunch-0.22.5/uxlaunch.h =================================================================== --- uxlaunch-0.22.5.orig/uxlaunch.h +++ uxlaunch-0.22.5/uxlaunch.h @@ -3,6 +3,7 @@ #include +#define LOGFILE "/var/log/uxlaunch.log" /* * Target user information @@ -23,12 +24,14 @@ extern int session_pid; extern int xpid; extern int verbose; +extern int x_session_only; extern void get_options(int argc, char **argv); extern void set_i18n(void); extern void setup_pam_session(void); extern void close_pam_session(void); extern void switch_to_user(void); +extern void setup_user_environment (void); extern void set_tty(void); extern void setup_xauth(void); extern void start_X_server(void); @@ -45,6 +48,7 @@ extern void autostart_panels(void); extern void autostart_desktop_files(void); extern void do_autostart(void); extern void start_desktop_session(void); +extern void wait_for_session_exit(void); extern void start_bash(void); extern void wait_for_X_exit(void); extern void set_text_mode(void); @@ -53,7 +57,7 @@ extern void oom_adj(int, int); extern void start_oom_task(void); extern void stop_oom_task(void); -extern void open_log(void); +extern void open_log(const char *); extern void lprintf(const char *, ...); extern void log_environment(void); ++++++ uxlaunch-set-sdl-audiodriver.patch ++++++ diff --git a/user.c b/user.c index 74cbeba..1723f0e 100644 --- a/user.c +++ b/user.c @@ -176,6 +176,7 @@ void setup_user_environment (void) setenv("MOZ_PLUGIN_PATH", ":/usr/lib/browser-plugins", 0); setenv("SSH_ASKPASS", "/usr/lib/ssh/x11-ssh-askpass", 0); setenv("ALSA_CONFIG_PATH", "/etc/alsa-pulse.conf", 0); + setenv("SDL_AUDIODRIVER", "pulse", 0); setenv("WINDOWMANAGER", "startmoblin", 0); snprintf(buf, PATH_MAX, "%s/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:" "/usr/X11R6/bin:/usr/games:/usr/lib/jvm/jre/bin:/usr/lib/mit/bin:" ++++++ uxlaunch-shutdown-gconfd.patch ++++++ Index: uxlaunch-0.22/misc.c =================================================================== --- uxlaunch-0.22.orig/misc.c +++ uxlaunch-0.22/misc.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "uxlaunch.h" @@ -102,6 +103,26 @@ void start_gconf(void) lprintf("failure to start gconftool-2: %d", ret); } +/* + * Stop gconfd to save gconf keys before shutdown + */ +void stop_gconf(void) +{ + const char *command = "gconftool-2 --shutdown"; + GError *error = NULL; + int status = 0; + + if (!g_spawn_command_line_sync (command, NULL, NULL, &status, &error)) { + g_warning ("Failed to execute '%s' on logout: %s\n", + command, error->message); + g_error_free (error); + } + + if (status) { + g_warning ("Running '%s' at logout returned an exit status of '%d'", + command, status); + } +} /* * Start the background screensaver daemon. Index: uxlaunch-0.22/uxlaunch.c =================================================================== --- uxlaunch-0.22.orig/uxlaunch.c +++ uxlaunch-0.22/uxlaunch.c @@ -79,6 +79,7 @@ int main(int argc, char **argv) if (x_session_only) { launch_user_session(); wait_for_session_exit(); + stop_gconf(); return 0; } @@ -104,6 +105,8 @@ int main(int argc, char **argv) wait_for_X_exit(); + stop_gconf(); + set_text_mode(); // close_consolekit_session(); Index: uxlaunch-0.22/uxlaunch.h =================================================================== --- uxlaunch-0.22.orig/uxlaunch.h +++ uxlaunch-0.22/uxlaunch.h @@ -41,6 +41,7 @@ extern void setup_consolekit_session(voi extern void start_ssh_agent(void); extern void stop_ssh_agent(void); extern void start_gconf(void); +extern void stop_gconf(void); extern void maybe_start_screensaver(void); extern void get_session_type(void); extern void autostart_panels(void); ++++++ uxlaunch-suse.patch ++++++ Index: uxlaunch-0.22.5/uxlaunch.sysconfig =================================================================== --- uxlaunch-0.22.5.orig/uxlaunch.sysconfig +++ uxlaunch-0.22.5/uxlaunch.sysconfig @@ -8,9 +8,9 @@ # except in values where they are needed. # # defaults: -# user=moblin -# tty=2 -# session=/usr/bin/mutter --sm-disable +user=linux +tty=3 +session=/usr/bin/mutter --sm-disable # # standard MOBLIN desktop: # session=/usr/bin/mutter --sm-disable ++++++ uxlaunch-user.diff ++++++ diff --git a/options.c b/options.c index a5760a0..336f50e 100644 --- a/options.c +++ b/options.c @@ -157,6 +157,8 @@ void get_options(int argc, char **argv) break; case 'x': x_session_only = 1; + if (getenv ("USER")) + strncpy (username, getenv ("USER"), 256); break; default: break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org