mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-launch: Run weston in the user login shell

Browse Source 
This patch brings back the user environment from the shell.
In the future, weston-launch could create the Wayland socket earlier, in
which case the user's shell could be used to run Wayland-specific tools
in the new Weston session.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2013-05-17 16:20:37 +02:00 committed by Kristian Høgsberg
parent 5545320c36
commit ff3230952a
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/weston-launch.c
View File

@ -60,6 +60,8 @@
#include "weston-launch.h"
#define MAX_ARGV_SIZE 256
struct weston_launch {
struct pam_conv pc;
pam_handle_t *ph;
@ -523,8 +525,9 @@ main(int argc, char *argv[])
struct weston_launch wl;
char **env;
int i, c;
char **child_argv;
char *child_argv[MAX_ARGV_SIZE];
char *tty = NULL, *new_user = NULL;
char *term;
int sleep_fork = 0;
struct option opts[] = {
{ "user", required_argument, NULL, 'u' },
@ -562,8 +565,8 @@ main(int argc, char *argv[])
}
}
child_argv = &argv[optind-1];
child_argv[0] = BINDIR "/weston";
if ((argc - optind) > (MAX_ARGV_SIZE - 5))
error(1, E2BIG, "Too many arguments to pass to weston");
if (new_user)
wl.pw = getpwnam(new_user);
@ -572,7 +575,17 @@ main(int argc, char *argv[])
if (wl.pw == NULL)
error(1, errno, "failed to get username");
child_argv[0] = wl.pw->pw_shell;
child_argv[1] = "-l";
child_argv[2] = "-c";
child_argv[3] = BINDIR "/weston \"$@\"";
child_argv[4] = "weston";
for (i = 0; i < (argc - optind); ++i)
child_argv[5+i] = argv[optind+i];
term = getenv("TERM");
clearenv();
setenv("TERM", term, 1);
setenv("USER", wl.pw->pw_name, 1);
setenv("LOGNAME", wl.pw->pw_name, 1);
setenv("HOME", wl.pw->pw_dir, 1);