Matthew Justin Bauer
0b58a5b260
Merge pull request #40052 from flokli/input_leds-doc
...
modules/system/boot/luksroot: remove comment about input_leds for caps lock
2018-05-09 07:54:47 +00:00
Florian Klink
5855459f49
modules/system/boot/luksroot: remove comment about input_leds for caps lock
...
Since f2a9f9aeab
, we already load
"input_leds", so this comment isn't useful anymore.
2018-05-07 01:42:37 +02:00
edef
54a13b07d5
switch-to-configuration: use Net::DBus to retrieve the list of units
...
This resolves the FIXME, and opens up the possibility of using more of
the systemd DBus interface to make things more robust.
2018-05-03 20:19:23 +02:00
Matthew Bauer
ca30c5e061
Revert "Merge pull request #28206 from edef1c/net-dbus-list-units"
...
This reverts commit e508f0eec1
, reversing
changes made to bead42df5d
.
2018-05-02 15:02:29 -05:00
Matthew Justin Bauer
e508f0eec1
Merge pull request #28206 from edef1c/net-dbus-list-units
...
switch-to-configuration: use Net::DBus to retrieve the list of units
2018-05-02 12:49:37 -05:00
xeji
1937b810b6
Merge pull request #39340 from xeji/interim-fix-39069
...
nixos/networkd: wait for udev to settle before starting networkd
2018-04-29 20:45:09 +02:00
Ben Gamari
65c1cfce3f
nixos/networkd: Allow RequiredForOnline field in [Link] section
...
This was previously missing.
2018-04-27 16:41:16 +00:00
xeji
236703f9f3
nixos/systemd-networkd: wait for udev to settle
...
... to avoid race condition between udevd renaming and
networkd configuring interfaces (39069)
2018-04-22 21:02:57 +02:00
Bastian Köcher
6ed495cf13
raspberrypi-bootloader: Adds firmwareConfig
config option
...
The `firmwareConfig` option will be appended to `/boot/config.txt`.
2018-04-22 18:27:17 +03:00
Bastian Köcher
8bc970bbc7
raspberrypi-bootloader: Adds support for using uboot
...
Uboot is copied into `/boot` in the installation process.
The boot entries are created by calling the `generic-extlinux-compatible` builder.
2018-04-22 18:27:17 +03:00
Jörg Thalheim
fecda3498b
Merge pull request #27117 from cjxgm/fix-nspawn-missing-suffix
...
systemd.nspawn: fix missing suffix
2018-04-22 15:21:07 +01:00
Daiderd Jordan
58fd592019
Merge pull request #38356 from Infinisil/fix/environment
...
nixos/systemd: Fix environment type -> allows overriding
2018-04-20 22:22:05 +02:00
Ihor Antonov
3a47c7e8f6
growPartition: fix volume resizing on EC2 NVME instances
...
The previous code for this accidentally picked up a "p" when computing the partition number.
This logic should be more robust
2018-04-19 13:36:03 -04:00
Graham Christensen
f4ff297cd5
Merge pull request #39031 from teto/loglevel
...
kernel: fix boot.consoleLogLevel description
2018-04-17 08:51:14 -04:00
Matthieu Coudron
9f7eabcc21
kernel: fix boot.consoleLogLevel description
...
The current description describes the opposite influence of the setting
https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt
2018-04-17 10:45:30 +09:00
Frederik Rietdijk
23741692fa
Merge master into staging
2018-04-04 19:36:39 +02:00
Eelco Dolstra
0236a947d0
mkdir -> install -d
...
Fixes #38421 .
2018-04-04 13:04:35 +02:00
Silvan Mosberger
e9fc2558f9
nixos/systemd: Fix environment type -> allows overriding
2018-04-03 00:36:52 +02:00
Shea Levy
05e375d710
Merge remote-tracking branch 'origin/master' into staging
2018-03-28 09:36:47 -04:00
Shea Levy
cdf9a78a3e
kexectools: Disable only on RISC-V if Linux.
...
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.
2018-03-27 08:15:07 -04:00
davidak
41676002b2
nixos/systemd: add option for cgroup accounting
2018-03-27 09:15:22 +02:00
Nikolay Amiantov
0ccab4946d
systemd: 237 -> 238
2018-03-22 22:37:26 +03:00
Tuomas Tynkkynen
ef64208eba
Merge commit '3ab2949' from staging into master
...
Conflicts:
pkgs/development/compilers/llvm/6/llvm.nix
pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Jan Malakhovski
8bbd48e40f
nixos: fix install-grub.pl dependencies
...
fallback from updates to perl
2018-03-15 04:51:12 +00:00
Tuomas Tynkkynen
2fec9c6e29
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Michael Raskin
bfbc4951a6
Merge pull request #36850 from teto/virtualisation
...
Virtualisation
2018-03-13 13:40:33 +00:00
Matthieu Coudron
c476d2f592
grub-install.pl: more details on blkid failure
2018-03-12 17:32:59 +09:00
Jan Malakhovski
7079e744d4
Merge branch 'master' into staging
...
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
2018-03-10 20:38:13 +00:00
edef
2fa1165e89
switch-to-configuration: use Net::DBus to retrieve the list of units
...
This resolves the FIXME, and opens up the possibility of using more of
the systemd DBus interface to make things more robust.
2018-03-05 12:05:01 -05:00
Dino Dai Zovi
ddf13e6646
nixos/initrd-network: add udhcpc.extraArgs option ( #36305 )
...
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>
2018-03-05 15:53:59 +00:00
Franz Pletz
17ba8bb3e0
Merge pull request #30416 from symphorien/luksnokey
...
nixos/luksroot.nix: fallback to interactive password entry when no keyfile found
2018-03-05 10:02:39 +00:00
Jörg Thalheim
a5dcde1a6f
Revert "networkd: also load builtin modules"
...
This reverts commit d514dc220e
.
breaks unpredicable network interfaces: https://github.com/NixOS/nixpkgs/pull/29768#issuecomment-370172863
2018-03-04 06:29:08 +00:00
Tuomas Tynkkynen
1e107443ad
Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging
2018-03-03 22:40:32 +02:00
Vladimír Čunát
b70c93f211
Merge branch 'master' into nix-2.0
2018-03-03 18:02:35 +01:00
Shea Levy
2802101e9f
Merge branch 'dropbear-2018-76-fix'
2018-03-01 21:35:06 -05:00
Shea Levy
f2937b7485
initrd-ssh: Fix for new dropbear version.
...
For some reason 2018.76 dropped the -m flag.
2018-03-01 21:21:27 -05:00
Shea Levy
95579af5ec
Merge remote-tracking branch 'origin/staging' into cross-nixos
2018-03-01 14:56:58 -05:00
Shea Levy
fec543436d
nixos: Move uses of stdenv.shell to runtimeShell.
2018-03-01 14:38:53 -05:00
Shea Levy
948e290895
stage-2-init: Use the host bash as SHELL
2018-03-01 14:03:41 -05:00
Shea Levy
897b7c7e9b
nixos: Fix initrd dependency detection when cross-compiling.
2018-03-01 13:31:36 -05:00
Jörg Thalheim
12422149a7
Merge pull request #29768 from Mic92/networkd
...
networkd: also load builtin modules
2018-03-01 09:16:18 +00:00
Shea Levy
cc81202293
nixos: initrd-kmod-blacklist-ubuntu: Fix cross-compilation.
2018-02-28 15:01:32 -05:00
Shea Levy
b28cb72908
nixos: stage-1: Don't try to test binaries when cross-compiling.
2018-02-28 15:01:32 -05:00
Shea Levy
a929301281
nixos: kexec: Disable on non-keexecable systems.
2018-02-28 15:01:31 -05:00
Aristid Breitkreuz
b8f4df9d9e
attempt to fix #30940 more robustly
2018-02-26 22:19:12 +01:00
Linus Heckemann
fd77a08b34
grub module: suggest by-id paths for devices
...
Since they are more stable, their use should be encouraged over that of
potentially volatile identifiers like /dev/[sh]da.
2018-02-24 10:50:23 +00:00
Eelco Dolstra
d12c9911df
Merge remote-tracking branch 'origin/master' into nix-2.0
2018-02-22 17:28:51 +01:00
Tim Steinbach
0500cf79af
plymouth: Fix reference to NixOS version
2018-02-19 11:05:32 -05:00
Michael Raskin
1e23a5a6e9
Merge pull request #34795 from oxij/os/nixosLabel-pt2
...
nixos: labels part 2
2018-02-19 14:45:17 +00:00
Shea Levy
c64639b54c
nixos/binfmt: Initial binfmt_msc support.
2018-02-18 12:42:17 -05:00