Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Bob van der Linden
a3d5f4f3ef
nixos: gummiboot: change default to 1000 if boot.loader.timeout is null
...
When gummiboot.timeout == null, the menu will still be skipped.
When gummiboot.timeout == 0, the menu will also be skipped.
The only way to show the menu 'indefinitely' is to show it a long time.
2015-01-30 10:36:21 +01:00
Bob van der Linden
f93ba51469
nixos: loader: added generic config.boot.loader.timeout option
...
timeout options of grub and gummiboot will inherit the value of this
option by default.
2015-01-30 09:53:44 +01:00
Domen Kožar
cb7cd012df
Merge pull request #5593 from abbradar/modprobe-fix
...
modprobe: wrap all of kmod
2015-01-24 07:11:16 +01:00
Peter Simons
ec6b82a0c2
Merge branch 'master' into staging.
2015-01-19 18:41:17 +01:00
wmertens
d3383e4879
Merge pull request #4394 from wmertens/patch-6
...
setup-etc.pl: Fail when symlink/rename fails
2015-01-19 12:39:41 +01:00
Longrin Wischnewski
4b0100774a
systemd: extend checkUnitConfig with on-abnormal
2015-01-19 11:41:18 +01:00
Eelco Dolstra
efa8fc2b0a
Paranoia
2015-01-15 18:37:55 +01:00
Eric Seidel
88eae46455
rename occurrences of gcc.gcc to gcc.cc
2015-01-14 20:47:49 -08:00
Luca Bruno
2beb43174f
nixos-rebuild: use reload-or-restart for dbus. Closes #5767
...
Now that dbus reload has been moved before restarting units,
the reload may fail if dbus has been stopped before.
The reload-or-restart will reload dbus if it's active,
otherwise start it.
2015-01-14 16:08:47 +01:00
Nikolay Amiantov
2aaeacc579
nixos/modprobe: wrap all of kmod
2015-01-06 16:39:00 +03:00
Eelco Dolstra
e62cb5585d
Merge pull request #5507 from DamienCassou/systemd-user-timers
...
Add systemd.user.timers
2014-12-30 15:40:43 +01:00
Damien Cassou
dcc93abe74
Add systemd.user.timers
2014-12-30 05:46:36 +01:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
Shea Levy
9245516b46
gummiboot-builder.py: run nix with no build-users-group
...
During install, the bootloader script gets run inside a chroot after the
/etc/group bind-mount is unmounted. Since we're not doing any building,
this should be safe, but really nix should just not care if the group
does not exist when no build is needed.
Fixes #5494
2014-12-29 07:09:10 -05:00
Alexander Kjeldaas
da1f8578b0
Eradicate gzip -9 without -n
2014-12-28 13:45:27 +01:00
Eelco Dolstra
80a85541d5
Typo
2014-12-19 14:38:33 +01:00
Eelco Dolstra
5ad3a02938
Shut up a warning from udev
...
Issue #5260 .
2014-12-19 14:37:50 +01:00
Eelco Dolstra
c812e45292
switch-to-configuration: Ignore slice units
2014-12-18 01:47:36 +01:00
Peter Simons
0f2b026bfe
nixos/modules/system/boot/luksroot.nix: hyperlinkify an URL in the documentation
2014-12-15 16:31:18 +01:00
Eelco Dolstra
88412c865d
Fix ANSI escape in warning messages
...
Seems to have been broken by accident in 7d1ddae58e
2014-12-15 16:19:35 +01:00
Vladimír Čunát
3bcd3ed017
nixos: check resumeDevice is absolute path and document
...
Fixes #5219 after merging #4995 .
(cherry picked from commit 0681d61c37
2014-12-12 11:11:57 +01:00
Jaka Hudoklin
8bb6fdc4f9
nixos/systemd: ignore null environment options
2014-12-07 21:44:20 +01:00
Emery Hemingway
e69f876cca
nixos: iPXE client for GRUB
...
fix bug in grub/install-grub.pl that would replace @bootRoot@ with an invalid string
2014-12-04 12:03:10 +01:00
William A. Kennington III
8a94c06595
nixos: Add network-pre.target and adjust firewall start ordering
2014-12-01 17:19:44 -08:00
William A. Kennington III
2b06a92c2a
nixos/nfs: Fix dependency ordering
2014-12-01 17:19:44 -08:00
William A. Kennington III
1c04e69bce
nixos/networking: Fix more harmless errors
2014-12-01 01:18:32 -08:00
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
