-
Notifications
You must be signed in to change notification settings - Fork 46
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Switch from X / IceWM to Wayland / Gnome shell #1868
Open
mchf
wants to merge
4
commits into
master
Choose a base branch
from
switch-to-wayland-and-gnome-shell
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
## Path: Desktop/Display manager | ||
## Description: settings to generate a proper displaymanager config | ||
## Type: yesno | ||
## Default: no | ||
# | ||
# Allow remote access (XDMCP) to your display manager (xdm/kdm/gdm). Please note | ||
# that a modified kdm or xdm configuration, e.g. by KDE control center | ||
# will not be changed. For gdm, values will be updated after change. | ||
# XDMCP service should run only on trusted networks and you have to disable | ||
# firewall for interfaces, where you want to provide this service. | ||
# | ||
DISPLAYMANAGER_REMOTE_ACCESS="no" | ||
|
||
## Type: yesno | ||
## Default: no | ||
# | ||
# Allow remote access of the user root to your display manager. Note | ||
# that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and | ||
# System/Security/Permissions/PERMISSION_SECURITY is "paranoid" | ||
# | ||
DISPLAYMANAGER_ROOT_LOGIN_REMOTE="no" | ||
|
||
## Type: yesno | ||
## Default: yes | ||
# | ||
# Let the displaymanager start a local Xserver. | ||
# Set to "no" for remote-access only. | ||
# Set to "no" on architectures without any Xserver (e.g. s390/s390x). | ||
# | ||
DISPLAYMANAGER_STARTS_XSERVER="yes" | ||
|
||
## Type: yesno | ||
## Default: no | ||
# | ||
# TCP port 6000 of Xserver. When set to "no" (default) Xserver is | ||
# started with "-nolisten tcp". Only set this to "yes" if you really | ||
# need to. Remote X service should run only on trusted networks and | ||
# you have to disable firewall for interfaces, where you want to | ||
# provide this service. Use ssh X11 port forwarding whenever possible. | ||
# | ||
DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN="no" | ||
|
||
## Type: string | ||
## Default: | ||
# | ||
# Define the user whom should get logged in without request. If string | ||
# is empty, display standard login dialog. | ||
# | ||
DISPLAYMANAGER_AUTOLOGIN="root" | ||
|
||
## Type: yesno | ||
## Default: no | ||
# | ||
# Allow all users to login without password, but ask for the user, if | ||
# DISPLAYMANAGER_AUTOLOGIN is empty. | ||
# | ||
DISPLAYMANAGER_PASSWORD_LESS_LOGIN="no" | ||
|
||
## Type: yesno | ||
## Default: no | ||
# | ||
# Display a combobox for Active Directory domains. | ||
# | ||
DISPLAYMANAGER_AD_INTEGRATION="no" | ||
## Path: Desktop/Display manager | ||
## Type: string(Xorg) | ||
## Default: "Xorg" | ||
# | ||
DISPLAYMANAGER_XSERVER="Xorg" |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#!/bin/sh | ||
# Start a browser to connect to Agama's web user interface skipping the authentication. | ||
# This script is invoked as a part of gnome-kiosk startup procedure. See /usr/bin/gnome-kiosk-script | ||
# which is at the end of the chain and invokes this script. | ||
|
||
TOKEN_FILE=/run/agama/token | ||
TOKEN=$(cat $TOKEN_FILE) | ||
PREFS=$HOME/.mozilla/firefox/profile/user.js | ||
|
||
sed -e "s/__HOMEPAGE__/http:\/\/localhost\/login?token=$TOKEN/" $PREFS.template > $PREFS | ||
firefox --profile $HOME/.mozilla/firefox/profile | ||
# Here, we would like to see | ||
# | ||
# firefox --kiosk --profile $HOME/.mozilla/firefox/profile | ||
# | ||
# But sadly firefox currently ends with black screen on wayland when run with --kiosk | ||
|
||
sleep 1.0 | ||
exec "$0" "$@" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
This file is just placeholder for creating content in /usr/bin/X/ directory. | ||
|
||
The directory is used to trick display-manager.service (script) to think that | ||
xorg-x11-server is installed. If the directory is not existing the above | ||
script/service ends with error reporting status=6/NOTCONFIGURED. We want to | ||
use Wayland (only), there is no sense in installing X11 server too. As it is | ||
not mentioned as direct dependency in any gnome and wayland related packages | ||
and kind of dependency happens only due to that check, we trick it by creating | ||
the directory. | ||
|
||
This is status at time of initial Wayland / GNOME Shell deployment in Agama's | ||
live iso. If the check is removed in the future feel free to drop whole | ||
/usr/bin/X from the image. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
[User] | ||
Session=gnome-kiosk-script-wayland |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a note, gnome-kiosk could be started without the need of GDM, that way those patterns wouldn't be needed, and the iso might be smaller.
Ref: joantolo@a73d832#diff-3de5b8b40cc886f42c9cf046debcaa27bcfe84d2a98f98229e882dce2d3dfe0eR148
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for reminding it. However, for me the biggest issue / blocker is the
firefox --kiosk
one for now