Parnell Springmeyer
48a0c5a3a7
More fixing
2017-01-26 01:00:46 -08:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts
2017-01-25 11:08:05 -08:00
Jörg Thalheim
ca0d747d6d
Merge pull request #21578 from Mic92/zfs
...
zfs: add unstable variant
2017-01-05 12:52:56 +01:00
Jörg Thalheim
4029470a6f
zfs: add unstable variant
...
Until now nixos only delivered the latest zfs release. This release is often not
compatible with the latest mainline kernel. Therefor an unstable variant is
added, which might be based on testing releases or git revisions.
fixes #21359
2017-01-05 08:40:50 +01:00
Bjørn Forsman
cb9195b7bc
nixos: provide /etc/hostname
...
/etc/hostname is the file used by hostnamectl(1) and the
org.freedesktop.hostname1 dbus service (both provided by systemd) to get
the "static hostname". Better provide it so that users of those
tools/services get a proper hostname.
An example of an issue created by the lack of /etc/hostname is that the
bluetooth stack on NixOS identifies itself to peers as "BlueZ $VERSION"
instead of the hostname.
References:
https://www.freedesktop.org/software/systemd/man/hostname.html
Changes v1 -> v2:
* ensure /etc/hostname ends with a newline
2017-01-02 19:14:06 +01:00
Bjørn Forsman
49d444416c
nixos: cosmetic refactor of environment.etc."hostid"
...
Create the file using attrset instead of list, to make it easier to
later provide other files in the same module.
2017-01-01 17:08:34 +01:00
Eric Sagnes
0ebc5ec7cb
network-interfaces: use enum
2016-11-16 22:37:57 +09:00
Eric Sagnes
ffc0e2f4fc
network-interfaces module: use enum
2016-11-04 13:05:44 +09:00
Arnold Krille
f16f4daa5b
sit interfaces: fix dependency tracking
2016-10-12 00:16:34 +02:00
Jörg Thalheim
550df4dc47
nixos network: fix evaluation after #19128
2016-10-12 00:06:34 +02:00
Arnold Krille
cc91f274e0
containers: Improve device dependency tracking
...
Now the tracking works with aggregated devices on aggregated devices.
So container with physical device where the device is put in a bond
which is the basis for a bridge is now handled correctly.
2016-10-08 22:28:49 +02:00
Arnold Krille
f0492bd53c
containers: Do not wait for udev for network devices
...
Test that adding physical devices to containers works, find that network setup
then doesn't work because there is no udev in the container to tell systemd
that the device is present.
Fixed by not depending on the device in the container.
Activate the new container test for release
Bonds, bridges and other network devices need the underlying not as
dependency when used inside the container. Because the device is already
there.
But the address configuration needs the aggregated device itself.
2016-10-08 22:09:22 +02:00
Joachim F
0906a0f197
Merge pull request #18491 from groxxda/network-interfaces
...
Replace Network-interfaces.target
2016-10-02 16:34:37 +02:00
Joachim Fasting
fc0dc65f41
network-interfaces-scripted: DefaultDependencies is a unitConfig
...
Ref: 072c1dcc4a
2016-10-02 15:52:20 +02:00
Joachim F
7e80c42b0e
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
...
modules: optionSet -> submodule
2016-10-01 17:57:45 +02:00
Eelco Dolstra
7e8eb6a7c3
Fix "undefined variable ‘device’" using autoFormat
2016-09-30 15:04:36 +02:00
Nikolay Amiantov
f42e0dc9fd
Merge pull request #18691 from abbradar/keys-fs
...
stage-2 init: move /run/keys mount to boot.specialFileSystems
2016-09-24 13:34:28 +04:00
aszlig
97801380b0
nixos/networking: Use type lines for localCommands
...
Using types.str doesn't work if you want to mkBefore/mkAfter across
different module definitions, because it only allows for one definition
for the same priority.
This is especially useful if you deploy Hetzner machines via NixOps,
because the physical specification already defines localCommands.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-09-20 13:32:17 +02:00
Nikolay Amiantov
79d4636d50
stage-2 init: move /run/keys mount to boot.specialFileSystems
2016-09-17 15:39:24 +03:00
Alexander Ried
85c36d1f7d
network-interfaces.target: add deprecation notice
2016-09-13 11:19:23 +02:00
Alexander Ried
072c1dcc4a
network-interfaces-scripted: rework dependencies
2016-09-13 11:19:23 +02:00
Данило Глинський (Danylo Hlynskyi)
896b2916ab
nixos: fix typo in networking.interfaces.<name?>.virtual ( #18548 )
2016-09-13 08:04:00 +02:00
Alexander Ried
06b2897c40
networking.dhcpcd: Don't add to system closure when using networkd ( #18436 )
2016-09-13 07:55:17 +02:00
Eric Sagnes
062928c3ad
network-interfaces module: optionSet -> submodule
2016-09-13 12:54:40 +09:00
Franz Pletz
c58654e2b7
treewide: fix fallout of ip-up deprecation
...
See #18319 for details. Starting network-online.target manually does not
work as it hangs indefinitely.
Additionally, don't treat avahi and dhcpcd special and sync their systemd units
with the respective upstream suggestion.
2016-09-11 08:13:04 +02:00
Alexander Ried
27bc34f1e4
treewide: deprecate ip-up.target ( #18319 )
...
Systemd upstream provides targets for networking. This also includes a target network-online.target.
In this PR I remove / replace most occurrences since some of them were even wrong and could delay startup.
2016-09-10 18:03:59 +02:00
Eelco Dolstra
58b028f9ee
nfs module: Fix dependency on statd and idmapd
...
http://hydra.nixos.org/build/40038016
2016-09-07 14:15:57 +02:00
Eelco Dolstra
015c984537
nfs module: Improve descriptions
2016-09-07 14:15:57 +02:00
Nikolay Amiantov
aed2cd32f8
nixos containers: hopefully fix test failures
...
Closes #18377 .
2016-09-07 02:55:48 +03:00
Karn Kallio
8d977ead38
setuid-wrappers : Prepare permissions for running wrappers
...
The new setuid-wrappers in /run cannot be executed by users due to:
1) the temporary directory does not allow access
2) the /run is mounted nosuid
2016-09-04 03:19:32 +02:00
Parnell Springmeyer
81b33eb466
security: Updating the machinery for creating the wrapper programs dir in var and updating ping and ping6 for changed config interface.
2016-09-01 19:16:36 -05:00
Parnell Springmeyer
79f1a1e07a
security: need to specify the ping binary paths for setcap wrappers.
2016-09-01 19:15:56 -05:00
Parnell Springmeyer
5deed1cb86
network-interfaces: use setcap-wrappers for ping and ping6 iff linux kernel is at-least 4.3
2016-09-01 19:13:54 -05:00
Tuomas Tynkkynen
d02e5a7d8f
nixos/filesystems: Drop compat code for filesystems.*.options type
2016-09-01 12:18:33 +03:00
Nikolay Amiantov
7fa8c424bd
nixos filesystems: move special filesystems to a dedicated option
...
Fixes #18159 .
2016-08-31 16:50:13 +03:00
Nikolay Amiantov
509733a343
Merge pull request #17822 from abbradar/systemd-mounts
...
nixos filesystems: unify special filesystems handling
2016-08-30 22:42:19 +04:00
Thomas Tuegel
1074c159f7
nixos/cpu-freq: list correct default governor in description
2016-08-28 17:14:37 -05:00
Nikolay Amiantov
6efcfe03ae
nixos filesystems: unify early filesystems handling
...
A new internal config option `fileSystems.<name>.early` is added to indicate
that the filesystem needs to be loaded very early (i.e. in initrd). They are
transformed to a shell script in `system.build.earlyMountScript` with calls to
an undefined `specialMount` function, which is expected to be caller-specific.
This option is used by stage-1, stage-2 and activation script to set up and
remount those filesystems. Options for them are updated according to systemd
defaults.
2016-08-27 13:38:20 +03:00
Nikolay Amiantov
3f70fcd4c1
Merge pull request #11484 from oxij/nixos-toposort-filesystems
...
lib: add toposort, nixos: use toposort for fileSystems to properly support bind and move mounts
2016-08-27 14:34:55 +04:00
Bjørn Forsman
6cd8f48327
nixos/filesystems: update /etc/fstab comment header
2016-08-24 20:40:58 +02:00
Jan Malakhovski
b267785c43
nixos: generalize copy-paste from stage-1 and zfs to utils
2016-08-23 18:14:06 +00:00
Jan Malakhovski
65d26c4dc1
nixos: apply toposort to fileSystems to support bind and move mounts
...
And use new `config.system.build.fileSystems` property everywhere.
2016-08-23 18:14:05 +00:00
Jan Malakhovski
2c8ca0d1bd
nixos: tasks/fileSystems: cleanup
2016-08-23 18:02:07 +00:00
Bjørn Forsman
8b18f3814f
treewide: update cifs-utils attr references (cifs_utils -> cifs-utils)
2016-08-22 17:28:26 +02:00
Nikolay Amiantov
5ff6e98486
modprobe service: drop kmod wrapper
2016-08-19 17:56:49 +03:00
Ricardo M. Correia
1cf9bcaa3f
zfs: print the output of the zpool command (if any) when it succeeds
2016-08-18 17:27:57 +02:00
Svein Ove Aas
98b213a110
zfs: Keep trying root import until it works
...
Works around #11003 .
2016-08-16 01:45:02 +01:00
Nikolay Amiantov
ddb75882b6
kbd task: fix colors in early initrd
2016-07-24 15:08:49 +03:00
Rok Garbas
db7b4fb073
Merge pull request #6846 from wizeman/u/zfs-auto-snap-flags
...
nixos: ZFS auto-snapshot improvements
2016-07-21 01:53:11 +02:00
Nikolay Amiantov
3cc54bbad9
Merge pull request #17082 from abbradar/fix-early-kbd
...
Use new early kbd-setting code in initrd and fix layouts from external packages
2016-07-20 23:52:45 +04:00
Svein Ove Aas
9a8e0d1c2e
zfs: Force sync on shutdown ( #16903 )
2016-07-19 09:57:13 +02:00
Nikolay Amiantov
cf64a7ecc0
kbd module: fix keymaps search for loadkeys
2016-07-18 23:46:38 +03:00
Nikolay Amiantov
7bed3d0cb3
nixos stage-1: move keymap handling to kbd module
2016-07-18 23:27:45 +03:00
Nikolay Amiantov
d9aafc885f
Merge branch 'early-kbd' into staging
2016-07-13 03:56:07 +03:00
Nikolay Amiantov
9e48baa716
kbd service: add support for early loading of fonts and keymaps
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
803b1eedd6
kbd service: add system-wise console resources
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
5622226d5b
kbd service: drop a comment now when we do restart vconsole setup
2016-07-08 20:44:01 +03:00
Nikolay Amiantov
6c11d9dd55
kbd service: add system-wise console resources
2016-07-08 12:52:39 +03:00
Nikolay Amiantov
489bbf0609
kbd service: drop a comment now when we do restart vconsole setup
2016-07-03 03:28:29 +03:00
Scott Olson
6d5ed7d971
Make fileSystems example literal.
...
This fixes the attribute names showing up unquoted in the options documentation.
2016-06-19 01:21:22 -06:00
Eelco Dolstra
c726773f26
cpufreq: Fix "sh: modprobe: command not found"
2016-05-24 21:48:42 +02:00
Franz Pletz
e16851b900
networking module: Add some missing literalExample
2016-04-25 18:15:52 +02:00
Svein Ove Aas
f03dc59803
zfs: Update devNodes description
2016-04-15 17:25:32 +01:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Eelco Dolstra
b250ac9290
Remove setting non-existent sysctl options
...
(cherry picked from commit 1010ced00c
)
2016-03-15 17:44:30 +01:00
Rickard Nilsson
6ff5821be6
nixos/filesystems: Fix fs options type error
2016-03-14 17:24:36 +01:00
Nikolay Amiantov
1111f73dde
sw-raid: rename mdadmShutdown
...
See aac666e302
I've forgotten to add the change.
2016-03-09 21:06:27 +03:00
kklas
aac666e302
sw-raid: make mdmon start from initrd
...
Also add required systemd services for starting/stopping mdmon.
Closes #13447 .
abbradar: fixed `mdadmShutdown` service name according to de facto conventions.
2016-03-09 21:03:49 +03:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
928035378d
Fix typo
2016-02-12 14:35:40 +01:00
Nikolay Amiantov
7ab80e8f79
kbd module: don't setup vconsoles if we are in a container
2016-02-10 13:38:27 +03:00
Aneesh Agrawal
3c5fca9618
filesystems: use list of strings for fs options
...
Allow usage of list of strings instead of a comma-separated string
for filesystem options. Deprecate the comma-separated string style
with a warning message; convert this to a hard error after 16.09.
15.09 was just released, so this provides a deprecation period during
the 16.03 release.
closes #10518
Signed-off-by: Robin Gloster <mail@glob.in>
2016-02-06 19:48:30 +00:00
Eelco Dolstra
b21ef9c9e6
Don't include wireless-tools/iw/rfkill when wireless is disabled
...
This is mostly to get rid of some useless stuff in VMs/containers.
2016-02-01 18:19:23 +01:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
rnhmjoj
641a951c61
i18n: Fix vconsole colorscheme generation
...
Close #12442 .
abbradar: remove trailing spaces.
2016-01-17 20:24:45 +03:00
Pascal Wittmann
009f944b9f
Merge pull request #12315 from tlevine/trackpoint-typo
...
trackpoint: fix typo in trackpoint speed description
2016-01-11 07:44:52 +01:00
Thomas Levine
2d6ebc9189
trackpoint: fix typo in configuration description
...
I fixed a typo in the description for hardware.trackpoint.speed.
2016-01-11 04:12:04 +00:00
Robin Gloster
88292fdf09
jobs -> systemd.services
2016-01-07 06:39:06 +00:00
William A. Kennington III
ce8c8f1e1b
Merge pull request #11890 from Baughn/zfs
...
zfs:Add option for zpool import -d, and set it to /dev/disk/by-id.
2016-01-05 14:37:19 -08:00
Tobias Geerinckx-Rice
82419575aa
btrfsProgs -> canonical btrfs-progs
2016-01-03 20:38:44 +01:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Timofei Kushnir
5925f9f709
Network script module fix
2015-12-25 03:43:49 +03:00
Svein Ove Aas
7688206a0b
zfs:Change default for -d to /dev/disk/by-id
2015-12-23 00:33:06 +01:00
Svein Ove Aas
9a82dd87f7
zfs:Add zfs.devNodes option for zpool import -d
2015-12-23 00:32:25 +01:00
Svein Ove Aas
7e86e9a048
zfs:Always import from /dev/disk/by-id
2015-12-12 20:32:38 +00:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Nikolay Amiantov
f3e8bb780c
nixos/kbd: make systemd-vconsole-setup work with KMS
2015-12-03 22:54:24 +03:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Kovacsics Robert (NixOS)
912f60c1e7
Revert part of #9982 to be in line with #9925
...
When creating PR #9982 , I undid a line of PR #9925 , that was some
cleanups and fixes, so this undoes that damage.
2015-11-26 14:40:31 +00:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Jaka Hudoklin
22c61d3bfc
Merge pull request #10218 from offlinehacker/nixos/format_options
...
add support for auto format, format options
2015-11-18 22:33:01 +01:00
Domen Kožar
0567714b99
Merge pull request #10610 from joachifm/scsi-link-pm
...
nixos: set scsi link power policy using udev
2015-11-16 13:21:36 +01:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
rnhmjoj
2a0f9d40ff
i18n: add color scheme option ( close #9626 )
2015-11-09 14:53:59 +01:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Joachim Fasting
7b2b366552
nixos: set scsi link power policy using udev
...
Also improve option type checking by enumerating valid policy names.
2015-10-25 19:38:53 +01:00
Nikolay Amiantov
de8b8b35a4
nixos/swap: refactor, add randomEncryption option
2015-10-20 15:56:12 +03:00