Commit 462f1e83 authored by Guido Gunther's avatar Guido Gunther

Merge branch 'login-shell' into 'master'

Use login shell so /etc/profile.d gets parsed

See merge request Librem5/phosh!96
parents ac6d1034 5c134ba7
......@@ -15,4 +15,6 @@ if [ -f "/etc/phosh/rootston.ini" ]; then
ROOTSTON_INI=/etc/phosh/rootston.ini
fi
exec "${ROOTSTON}" -C "${ROOTSTON_INI}" -E "gnome-session --disable-acceleration-check --session=phosh"
# Run gnome-session through a login shell so it picks
# variables from /etc/profile.d (XDG_*)
exec "${ROOTSTON}" -C "${ROOTSTON_INI}" -E "bash -lc 'gnome-session --disable-acceleration-check --session=phosh'"
[core]
xwayland=false
#[core]
#xwayland=false
[cursor:seat0]
map-to-output:HDMI-A-1
......
......@@ -100,10 +100,10 @@ output_handle_mode (void *data,
if (height > self->height)
self->height = height;
if ((flags & WL_OUTPUT_MODE_CURRENT) == 1)
if (flags & WL_OUTPUT_MODE_CURRENT)
self->current_mode = self->modes->len - 1;
if ((flags & WL_OUTPUT_MODE_PREFERRED) == 1)
if (flags & WL_OUTPUT_MODE_PREFERRED)
self->preferred_mode = self->modes->len - 1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment