William A. Kennington III
7ecb084b77
nixos/networking: More fixes
2014-11-29 22:35:03 -08:00
William A. Kennington III
1860ee27b0
nixos/networking: Fixes
2014-11-26 16:29:24 -08:00
William A. Kennington III
0626c1ecf0
nixos/systemd: ip-up and network-online targets should come after networkd-wait-online
2014-11-26 11:22:02 -08:00
William A. Kennington III
59f512ef7d
nixos/network-interfaces: Provide a networkd implementation
2014-11-26 11:22:02 -08:00
William A. Kennington III
045132a9b0
systemd-network: Add assertions for user clarity
2014-11-26 11:22:02 -08:00
William A. Kennington III
a332c4eac5
systemd: Enable more network services
2014-11-26 11:22:02 -08:00
William A. Kennington III
08e74f2791
systemd: Add ability to define networks
2014-11-26 11:22:02 -08:00
Nikolay Amiantov
a2eb7ca23c
stage-1: fix hibernation for device node symlinks
...
closes #4995
2014-11-15 21:44:37 +02:00
Eelco Dolstra
ca441636f1
Merge branch 'staging'
2014-11-14 16:00:23 +01:00
Vladimír Čunát
b4af993c3f
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Rene Donner
8bd2f6bfc1
some typos
2014-11-14 13:05:55 +01:00
wmertens
5c19521c6e
Merge pull request #4807 from wizeman/u/zfs-improvements
...
ZFS improvements
2014-11-13 10:26:30 +01:00
Shea Levy
ba7c80eefb
Fix init= stage 1 test
2014-11-12 18:25:03 -05:00
Ricardo M. Correia
e9affb4274
nixos: Add system-wide option to set the hostid
...
The old boot.spl.hostid option was not working correctly due to an
upstream bug.
Instead, now we will create the /etc/hostid file so that all applications
(including the ZFS kernel modules, ZFS user-space applications and other
unrelated programs) pick-up the same system-wide host id. Note that glibc
(and by extension, the `hostid` program) also respect the host id configured in
/etc/hostid, if it exists.
The hostid option is now mandatory when using ZFS because otherwise, ZFS will
require you to force-import your ZFS pools if you want to use them, which is
undesirable because it disables some of the checks that ZFS does to make sure it
is safe to import a ZFS pool.
The /etc/hostid file must also exist when booting the initrd, before the SPL
kernel module is loaded, so that ZFS picks up the hostid correctly.
The complexity in creating the /etc/hostid file is due to having to
write the host ID as a 32-bit binary value, taking into account the
endianness of the machine, while using only shell commands and/or simple
utilities (to avoid exploding the size of the initrd).
2014-11-12 22:31:49 +01:00
Eelco Dolstra
c5a7ff0afd
Fix /dev/root udev rule in the ISO
2014-11-11 23:48:31 +01:00
Eelco Dolstra
f33fa1b66b
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Luca Bruno
b77d166b17
nixos: move bcache udev rule in a new bcache.nix module
2014-11-10 22:19:43 +01:00
Luca Bruno
31df4f70af
nixos: Add boot.initrd.extraUdevRulesCommands
2014-11-10 22:19:43 +01:00
Luca Bruno
6af0d6974f
Merge branch 'master' into staging
2014-11-10 10:03:52 +01:00
Luca Bruno
510fba95e8
nixos-rebuild: reload dbus before starting other units. Closes #4546
2014-11-08 19:40:28 +01:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
2014-11-05 15:00:44 +01:00
Nikolay Amiantov
775f381a9e
stage-1: add bcache support
...
This adds necessary udev rule into initrd to support autodetecting
bcache partitions in stage-1. It also fixes 'sh' path for the new
rule to work.
2014-11-02 19:03:50 +03:00
Vladimír Čunát
2cf17b0802
Merge recent master into staging
...
Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
William A. Kennington III
f020a26164
nixos/systemd: Also escape \ characters
2014-10-19 16:34:53 -07:00
Vladimír Čunát
359dd3b8ac
nixos: fix two pipefail problems
...
It failed since 3c6efec2c0#4453 .
Now it should "work" the same as before.
2014-10-19 19:29:28 +02:00
Domen Kožar
2fa662c957
systemd: replace @ when generating unit command name
2014-10-19 17:20:37 +02:00
Domen Kožar
0854836fd2
systemd: include name of the unit when generating nix store path
2014-10-19 15:49:55 +02:00
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Eelco Dolstra
058bf4ccc4
Create a udev rule for /dev/root
...
In the installation CD, this ensures that systemd will see a proper
udev node for /dev/root.
Fixes #4399 .
Borrowed from
http://lists.freedesktop.org/archives/systemd-devel/2014-July/020988.html
2014-10-10 17:18:04 +02:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Eelco Dolstra
97220c973f
Replace hasAttr/getAttr calls with the ? and . operators
...
For NixOS evaluation, this gives a ~21% reduction in the number of
values allocated and a ~4% speedup. It's also more readable.
2014-10-05 01:11:06 +02:00
Franz Pletz
30690d05bc
Add cryptodisk support for Grub
...
Closes #4193
2014-09-24 21:48:55 +01:00
Eelco Dolstra
38d57b4a94
Merge pull request #4244 from abbradar/resume
...
Replace resumeDevice with autodetection of hibernation partition
2014-09-24 18:05:53 +02:00
Nikolay Amiantov
ba31749458
stage-1: Use udevadm instead of blkid
2014-09-24 20:00:51 +04:00
Nikolay Amiantov
18bd9917ed
stage-1: autodetect resume swap partitions
2014-09-24 18:51:44 +04:00
William A. Kennington III
13ca3708b5
Fix #4236
2014-09-23 10:18:05 -07:00
Rickard Nilsson
5be23fe888
nixos/install-grub: Don't run GrubFs(/nix/store) if copyKernels is true
2014-09-23 14:34:44 +02:00
Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
William A. Kennington III
4d193b7262
systemd: Support reload scripts
2014-09-15 20:04:49 -07:00
Eelco Dolstra
152ae27aac
Merge remote-tracking branch 'origin/systemd-216' into staging
2014-09-08 13:53:33 +02:00
Luca Bruno
dfa6f03ea3
Do not assert absolute path for nodev grub device. Closes #3996
2014-09-08 12:00:34 +02:00
Thomas Tuegel
53fa517176
Merge pull request #3961 from wkennington/master.grub
...
nixos/install-grub: Read correct mountpoints
2014-09-05 20:01:08 -05:00
Luca Bruno
718106e958
Fix initrd after recent busybox upgrades
2014-09-05 18:42:53 +02:00
William A. Kennington III
c6bd6d6d89
nixos/grub: Assert devices should be absolute paths
2014-09-04 10:31:39 -07:00
William A. Kennington III
f73f7ccc6e
nixos/install-grub: Read correct mountpoints
2014-09-04 10:31:39 -07:00
Michael Raskin
1a0d437bf3
Merge pull request #3944 from joshcartwright/gummiboot-timeout-fix
...
gummiboot/builder: fix timeout setting when unset
2014-09-04 20:17:44 +04:00
William A. Kennington III
eee8fd89b3
nixos/install-grub: Correct store path for search
2014-09-03 10:01:00 -07:00
Josh Cartwright
626a666da5
gummiboot/builder: fix timeout setting when unset
...
The gummiboot-builder.py script is expecting the @timeout@ metavar to be
substituted for either an empty string (in the case where a user has
left the timeout unset) or the actual value set in the system
configuration.
However, the config.boot.loader.gummiboot.timeout option defaults to
'null', and due to the way pkgs.substituteAll works, the substitution
for '@timeout@' is _never_ set to the empty string. This causes the
builder script to put a bogus line into /boot/loader/loader.conf:
timeout @timeout@
Fix this by explicitly setting 'timeout' to the empty string when it's
unset in the system configuration.
Signed-off-by: Josh Cartwright <joshc@eso.teric.us>
2014-09-03 05:36:45 +02:00
William A. Kennington III
ccc758f414
nixos/install-grub: Fix typo
2014-09-02 18:56:53 -07:00
William A. Kennington III
961e9867b3
nixos/generate-config: Only add store search path when kernels are not copied
2014-09-02 09:16:13 -07:00
