summary refs log tree commit diff
path: root/nixos/modules/system
Commit message (Collapse)AuthorAge
* Merge pull request #38356 from Infinisil/fix/environmentDaiderd Jordan2018-04-20
|\ | | | | nixos/systemd: Fix environment type -> allows overriding
| * nixos/systemd: Fix environment type -> allows overridingSilvan Mosberger2018-04-03
| |
* | growPartition: fix volume resizing on EC2 NVME instancesIhor Antonov2018-04-19
| | | | | | | | | | The previous code for this accidentally picked up a "p" when computing the partition number. This logic should be more robust
* | Merge pull request #39031 from teto/loglevelGraham Christensen2018-04-17
|\ \ | | | | | | kernel: fix boot.consoleLogLevel description
| * | kernel: fix boot.consoleLogLevel descriptionMatthieu Coudron2018-04-17
| | | | | | | | | | | | | | | The current description describes the opposite influence of the setting https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt
* | | Merge master into stagingFrederik Rietdijk2018-04-04
|\ \ \
| * | | mkdir -> install -dEelco Dolstra2018-04-04
| | |/ | |/| | | | | | | Fixes #38421.
* | | Merge remote-tracking branch 'origin/master' into stagingShea Levy2018-03-28
|\| |
| * | kexectools: Disable only on RISC-V if Linux.Shea Levy2018-03-27
| | | | | | | | | | | | | | | | | | The isKexecable flag treated Linux without kexec as just a normal variant, when it really should be treated as a special case incurring complexity debt to support.
| * | nixos/systemd: add option for cgroup accountingdavidak2018-03-27
| |/
* / systemd: 237 -> 238Nikolay Amiantov2018-03-22
|/
* Merge commit '3ab2949' from staging into masterTuomas Tynkkynen2018-03-15
|\ | | | | | | | | | | Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
| * Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-13
| |\ | | | | | | | | | | | | Conflicts: pkgs/development/tools/build-managers/conan/default.nix
| * \ Merge branch 'master' into stagingJan Malakhovski2018-03-10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
| * \ \ Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into stagingTuomas Tynkkynen2018-03-03
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/staging' into cross-nixosShea Levy2018-03-01
| |\ \ \ \
| * | | | | nixos: Move uses of stdenv.shell to runtimeShell.Shea Levy2018-03-01
| | | | | |
| * | | | | stage-2-init: Use the host bash as SHELLShea Levy2018-03-01
| | | | | |
| * | | | | nixos: Fix initrd dependency detection when cross-compiling.Shea Levy2018-03-01
| | | | | |
| * | | | | nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation.Shea Levy2018-02-28
| | | | | |
| * | | | | nixos: stage-1: Don't try to test binaries when cross-compiling.Shea Levy2018-02-28
| | | | | |
| * | | | | nixos: kexec: Disable on non-keexecable systems.Shea Levy2018-02-28
| | | | | |
* | | | | | nixos: fix install-grub.pl dependenciesJan Malakhovski2018-03-15
| |_|_|_|/ |/| | | | | | | | | | | | | | fallback from updates to perl
* | | | | Merge pull request #36850 from teto/virtualisationMichael Raskin2018-03-13
|\ \ \ \ \ | |_|_|_|/ |/| | | | Virtualisation
| * | | | grub-install.pl: more details on blkid failureMatthieu Coudron2018-03-12
| | | | |
* | | | | nixos/initrd-network: add udhcpc.extraArgs option (#36305)Dino Dai Zovi2018-03-05
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used to fix issues where udhcpc times out before acquiring a lease. For example of these issues, see: https://bugs.alpinelinux.org/issues/3105#note-8 Signed-off-by: Dino A. Dai Zovi <ddz@theta44.org>
* | | | Merge pull request #30416 from symphorien/luksnokeyFranz Pletz2018-03-05
|\ \ \ \ | | | | | | | | | | nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
| * | | | luksroot.nix: rename fallback to fallbackToPasswordSymphorien Gibol2017-12-14
| | | | |
| * | | | nixos/luksroot.nix: add option boot.initrd.luks.devices.<name?>.fallbackSymphorien Gibol2017-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option, if set to true, enables fallbacking to an interactive passphrase prompt when the specified keyFile is not found. The default is false, which is compatible with previous behavior and doesn't prevent unattended boot.
| * | | | nixos/luksroot.nix: fallback to interactive password entry when no keyfile foundSymphorien Gibol2017-10-14
| | | | |
* | | | | Revert "networkd: also load builtin modules"Jörg Thalheim2018-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d514dc220e9fad27a46ef329360bb8db2cdf22ea. breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
* | | | | Merge branch 'master' into nix-2.0Vladimír Čunát2018-03-03
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'dropbear-2018-76-fix'Shea Levy2018-03-01
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | initrd-ssh: Fix for new dropbear version.Shea Levy2018-03-01
| | | |/ | | |/| | | | | | | | | For some reason 2018.76 dropped the -m flag.
| * | | Merge pull request #29768 from Mic92/networkdJörg Thalheim2018-03-01
| |\ \ \ | | |/ / | |/| | networkd: also load builtin modules
| | * | networkd: also load builtin modulesJoerg Thalheim2017-09-25
| | | |
| * | | attempt to fix #30940 more robustlyAristid Breitkreuz2018-02-26
| | | |
| * | | grub module: suggest by-id paths for devicesLinus Heckemann2018-02-24
| | | | | | | | | | | | | | | | | | | | Since they are more stable, their use should be encouraged over that of potentially volatile identifiers like /dev/[sh]da.
* | | | Merge remote-tracking branch 'origin/master' into nix-2.0Eelco Dolstra2018-02-22
|\| | |
| * | | plymouth: Fix reference to NixOS versionTim Steinbach2018-02-19
| | | |
| * | | Merge pull request #34795 from oxij/os/nixosLabel-pt2Michael Raskin2018-02-19
| |\ \ \ | | | | | | | | | | nixos: labels part 2
| | * | | nixos: rename config.system.nixos* -> config.system.nixos.*Jan Malakhovski2018-02-18
| | | | |
| | * | | nixos: add system.boot.loader.initrdFile option and use it where appropriateJan Malakhovski2018-02-18
| | | | |
| * | | | nixos/binfmt: Initial binfmt_msc support.Shea Levy2018-02-18
| |/ / /
| * | | Merge pull request #34492 from rnhmjoj/privacyJoachim F2018-02-17
| |\ \ \ | | | | | | | | | | nixos/networking-interfaces: add preferTempAddress option
| | * | | nixos/networking-interfaces: add preferTempAddress optionrnhmjoj2018-02-01
| | | | |
| * | | | nixos/boot: allow kernel.printk override (#34958)Matthieu Coudron2018-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At one point in my configuration I had: boot.kernel.sysctl = { # https://unix.stackexchange.com/questions/13019/description-of-kernel-printk-values "kernel.printk" = "4 4 1 7"; }; which triggered: error: The unique option `boot.kernel.sysctl.kernel.printk' is defined multiple times, in `/home/teto/dotfiles/nixpkgs/mptcp-unstable.nix' and `/home/teto/nixpkgs/nixos/modules/system/boot/kernel.nix'. (use ‘--show-trace’ to show detailed location information) Traceback (most recent call last): File "/home/teto/nixops/scripts/nixops", line 984, in <module> args.op() File "/home/teto/nixops/scripts/nixops", line 406, in op_deploy max_concurrent_activate=args.max_concurrent_activate) File "/home/teto/nixops/nixops/deployment.py", line 1045, in deploy self.run_with_notify('deploy', lambda: self._deploy(**kwargs)) File "/home/teto/nixops/nixops/deployment.py", line 1034, in run_with_notify f() File "/home/teto/nixops/nixops/deployment.py", line 1045, in <lambda> self.run_with_notify('deploy', lambda: self._deploy(**kwargs)) File "/home/teto/nixops/nixops/deployment.py", line 985, in _deploy self.configs_path = self.build_configs(dry_run=dry_run, repair=repair, include=include, exclude=exclude) File "/home/teto/nixops/nixops/deployment.py", line 653, in build_configs raise Exception("unable to build all machine configurations") Exception: unable to build all machine configurations This simple addition allows to override it.
| * | | | Merge staging and PR #35021Vladimír Čunát2018-02-16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | It's the last staging commit (mostly) built on Hydra, and a minimal fix for Darwin regression in pysqlite.
| | * | | | systemd: 234 -> 237Franz Pletz2018-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Florian Klink <flokli@flokli.de> Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>
| * | | | | makeModulesClosure: support firmwareNikolay Amiantov2018-02-16
| | | | | | | | | | | | | | | | | | | | | | | | Link it in stage 1.