Skip to content

installer: autorun xserver in graphical media #46997

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.

Sign up for GitHub

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

Merged
worldofpeace merged 3 commits into from
Oct 5, 2019
Merged

installer: autorun xserver in graphical media #46997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6f5151
installer: autorun xserver in graphical media
worldofpeace Sep 20, 2018
4895483
nixos/iso-image: add menu entry to disable display-manager
worldofpeace Sep 28, 2019
159b12b
rl-2003: graphical image autoruns X
worldofpeace Sep 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@
Postgresql for NixOS service now defaults to v11.
</para>
</listitem>
<listitem>
<para>
The graphical installer image starts the graphical session automatically.
Before you'd be greeted by a tty and asked to enter <command>systemctl start display-manager</command>.
It is now possible to disable the display-manager from running by selecting the <literal>Disable display-manager</literal>
quirk in the boot menu.
</para>
</listitem>
</itemizedlist>
</section>

Expand Down
3 changes: 0 additions & 3 deletions nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ with lib;
services.xserver = {
enable = true;

# Don't start the X server by default.
autorun = mkForce false;

# Automatically login as nixos.
displayManager.slim = {
enable = true;
Expand Down
8 changes: 8 additions & 0 deletions nixos/modules/installer/cd-dvd/iso-image.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,14 @@ let
${buildMenuAdditionalParamsGrub2 config "video=1920x1080@60"}
}

# If we boot into a graphical environment where X is autoran
# and always crashes, it makes the media unusable. Allow the user
# to disable this.
submenu "Disable display-manager" --class quirk-disable-displaymanager {
Copy link
Member

@samueldr samueldr Sep 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can introduce an icon, if desired, and if one can be composed. They are composed from the breeze icon theme. If you see something in it that can be adapted, or used as an inspiration I can look into adding it to the relevant artwork.

Copy link
Contributor Author

@worldofpeace worldofpeace Sep 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found breeze/devices/64/video-display.svg the most suitable.
I mostly wanted something like just a blank monitor, or communicates a tty.

Copy link
Contributor Author

@worldofpeace worldofpeace Sep 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm highly partial to elementary's icons which appears to be exactly what I'm looking for

Screenshot from 2019-09-28 21 14 48

Copy link
Member

@samueldr samueldr Sep 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, forgot to specify the symbolic icons. Though the one from breeze, once made into outlines, may work, I'll try to remember to look into it later. (The PR can be merged without that change.)

Copy link
Contributor Author

@worldofpeace worldofpeace Sep 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, there's computer/video-display symbolic icons that should be fine then.
I'll add an issue at nixos-artwork for that once merged @samueldr.

${grubMenuCfg}
${buildMenuAdditionalParamsGrub2 config "systemd.mask=display-manager.service"}
}

# Some laptop and convertibles have the panel installed in an
# inconvenient way, rotated away from the keyboard.
# Those entries makes it easier to use the installer.
Expand Down