Skip to content
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

Change ISO image defaults #67305

Merged
merged 2 commits into from Sep 28, 2019
Merged

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Aug 22, 2019

Motivation for this change

The ISO image has some bad and outdated defaults.
Let's update them before 19.09.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@worldofpeace
Copy link
Contributor

Hey @adisbladis.

The manual desktop file is unneeded in the graphical iso now, as the nixos documentation ships its own desktop file

We might have to link it to the desktop from /run/current-system/sw/share/applications though.

@worldofpeace
Copy link
Contributor

Hijacked your PR a bit here @adisbladis. Hope you don't mind 😄

The only commit I'm concerned about here is 119579f.
I've seen some un-fun moments with nouveau in #nixos.

@ttuegel
Copy link
Member

ttuegel commented Sep 28, 2019

What is the status of this?

@worldofpeace
Copy link
Contributor

It's after 19.09 now so I guess we'll finish this for 20.03.

@ttuegel The only change that was originally from here was making libinput default for plasma5.

@ttuegel
Copy link
Member

ttuegel commented Sep 28, 2019

It's after 19.09 now so I guess we'll finish this for 20.03.

It all looks good to me, so if it's ready, let's merge! It will still be good to have in master for those of us who periodically have to generate our own ISOs. 😃

@samueldr
Copy link
Member

samueldr commented Sep 28, 2019

+1 on re-enabling nouveau 6948c3a#commitcomment-12369327

Though maybe we could add a new option in the boot menu to blacklist nouveau if there are fears of issues.

@samueldr
Copy link
Member

samueldr commented Sep 28, 2019

After having checked the kernel source, we don't need to add blacklisting for the nouveau driver as an option I think. In the off chance a platform is found that nomodeset is not enough, they can edit the command line themselves to do it.

nomodeset should be enough for most cases.

https://github.com/torvalds/linux/blob/a2953204b576ea3ba4afd07b917811d50fc49778/drivers/video/console/vgacon.c#L112-L124
https://github.com/torvalds/linux/blob/a2953204b576ea3ba4afd07b917811d50fc49778/drivers/gpu/drm/nouveau/nouveau_drm.c#L1256-L1263

It short circuits the driver initialization at pretty much the earliest moment possible.

@worldofpeace
Copy link
Contributor

@samueldr Sounds good. Thanks for checking with me.

@worldofpeace worldofpeace merged commit 1d1ff2c into NixOS:master Sep 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants