William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Robbin C
528ebb4e5e
Fix typo in nixos/modules/tasks/filesystems/nfs.nix.
...
statd should be cfg.statd.
2015-10-14 08:48:34 +08:00
Thomas Strobel
acb1b3cdd0
networking module: wlanInterfaces: fix file name of udev rules
2015-10-06 20:12:39 +02:00
Thomas Strobel
881ec1efb8
networking module: vswitches: re-structure dependencies to systemd units
2015-10-06 20:12:39 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Thomas Strobel
d286ac5887
networking module: restructure wlanInterfaces
...
Restructure internals of networking.wlanInterfaces option to generate
proper '.device' systemd targets for the WLAN interfaces.
2015-10-04 11:00:05 +02:00
Thomas Strobel
213bb58752
networking module: fix for wlanInterfaces
2015-10-02 12:16:20 +02:00
Thomas Strobel
6dfb16730b
networking module: fix DocBook tags
2015-10-01 17:50:42 +02:00
Thomas Strobel
c0248c0c1f
networking module: init 'wlanInterfaces' option
...
Configuration option for setting up virtual WLAN interfaces.
If the hardware NIC supports it, then multiple virtual WLAN interfaces can be
configured through the options of the new 'networking.wlanInterfaces' module.
For example, the following configuration transforms the device with the persistent
udev name 'wlp6s0' into a managed and a ad hoc device with the device names
'wlan-managed0' and 'wlan-adhoc0', respectively:
networking.wlanInterfaces = {
"wlan-managed0" = {
type = "managed";
device = "wlp6s0";
};
"wlan-adhoc0" = {
type = "ibss";
device = "wlp6s0";
};
};
Internally, a udev rule is created that matches wlp6s0 and runs a script which adds
the missing virtual interfaces and re-configures the wlp6s0 interface accordingly.
Once the new interfaces are created by the Linux kernel, the configuration of the
interfaces is managed by udev and systemd in the usual way.
2015-10-01 15:35:30 +02:00
Eelco Dolstra
0e3c1e31b1
Remove zfs-git and spl-git
...
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343 .
2015-09-29 14:54:12 +02:00
ts468
6d5a742c2e
Merge pull request #10000 from ts468/upstream.vswitch
...
nixos networking: add vswitch option
2015-09-29 00:52:58 +02:00
Edward Tjörnhammar
a0918e2e62
Merge pull request #9982 from KoviRobi/fix-encrypted-non-root-devices
...
encrypted-devices service: Fix keyed mount, clarify descriptions.
2015-09-27 12:42:08 +02:00
Thomas Strobel
59bc47c9ed
nixos networking: add vswitch option
...
Add a configuration option for Open vSwitch that is
similar to the option for the Linux kernel ethernet
bridge.
2015-09-25 11:55:27 +02:00
Eelco Dolstra
9d92bd7845
Add filesystem option to automatically grow to the maximum size
...
This is primarily for EC2 and other cloud environments, where the disk
may be bigger than the original image.
2015-09-24 19:59:44 +02:00
Eelco Dolstra
f40c7ed143
Remove relatime mount option
...
This has been the kernel default for a long time.
2015-09-24 19:58:41 +02:00
Kovacsics Robert (NixOS)
70fd4b4b02
encrypted-devices service: Fix keyed mount, clarify descriptions.
...
Not enough arguments were supplied to cryptsetup when a key-file was
specified. Also don't try to unlock keyedEncDevs with a password.
2015-09-22 09:49:28 +01:00
aszlig
f9766f885d
nixos/filesystems: Skip check for vboxsf.
...
We don't even have any means to check a VirtualBox shared folder, so
let's not even try to.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-21 22:32:14 +02:00
aszlig
cd4caed35a
nixos/filesystems: Improve vboxsf default options.
...
The default options for all file systems currently are
"defaults.relatime", which works well on file systems which support the
relatime option.
Unfortunately, this is not the case for the VirtualBox shared folder
filesystem, so until now, you need to set something like:
fileSystems."/foo" = {
device = "foo";
fsType = "vboxsf";
options = "defaults";
};
Otherwise mounting the file system would fail.
Now, we provide only the "defaults" option to the "vboxsf" file system,
so something like this is enough:
fileSystems."/foo" = {
device = "foo";
fsType = "vboxsf";
};
An alternative to that could be to document that you need to set default
options, but we really should do what users expect instead of forcing
them to look up the documentation as to why this has failed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-21 22:32:14 +02:00
Jaka Hudoklin
74209a4ca8
virtualbox service: add support for vboxsf guest filesystem
...
Closes #9358
Signed-off-by: Jaka Hudoklin <jakahudoklin@gmail.com>
Fix reference to bin/mount.vboxsf.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-21 22:32:13 +02:00
Jan Malakhovski
6eadb16022
nixos: fix some types
2015-09-18 18:48:50 +00:00
Eelco Dolstra
fab3090693
Don't include wireless tools in containers
2015-07-22 12:51:21 +02:00
Eelco Dolstra
6e6a96d42c
Some more type cleanup
2015-06-15 18:18:46 +02:00
Nikolay Amiantov
7355066bfe
nixos: add support for exfat filesystem
2015-05-27 18:59:33 +03:00
Aristid Breitkreuz
4835763e13
Trackpoint scrolling on T450s et al
2015-05-25 20:00:35 +02:00
Eelco Dolstra
d5f187de03
Typo
2015-04-20 16:12:28 +02:00
Eelco Dolstra
d4d6b8cc61
Grmbl
2015-04-20 14:24:42 +02:00
Eelco Dolstra
fc91ba52df
ntfs.nix: Remove copypasta jfs stuff
...
Thanks to @wizeman for spotting this!
2015-04-20 14:06:44 +02:00
Cray Elliott
479f5f4ae6
fix rebuild when using ntfs partitions
...
needed to define inInitrd, used vfat.nix as a template
2015-04-19 15:17:23 -07:00
Eelco Dolstra
2b6d011bec
Include cifs-utils only when needed
...
Issue #7117 .
2015-04-19 22:06:45 +02:00
Eelco Dolstra
57b05765c9
Don't include ntfs-3g by default
...
Issue #7117 .
2015-04-19 22:06:45 +02:00
William A. Kennington III
9718561589
nixos/vfat: Readd fsck.reiserfs
2015-03-28 19:07:45 -07:00
William A. Kennington III
c379847fda
nixos/vfat: Readd fsck.vfat
2015-03-28 19:06:43 -07:00
William A. Kennington III
4868649f03
nixos/initrd: Generic library copying
2015-03-28 18:37:29 -07:00
Ricardo M. Correia
4d2317e6eb
nixos/zfs: Don't default to git version for kernels >= 3.19
...
Stable version 0.6.3-1.3 works with kernels 3.19.x.
2015-03-19 19:37:33 +01:00
Robin Gloster
a8a350e679
Add Elanthec PS/2 Trackpoint (Thinkpad L430)
2015-03-15 00:09:04 +01:00
Joachim Fasting
d375550ead
nixos: add a few missing type specifiers under boot.*
2015-02-28 09:19:23 +01:00
William A. Kennington III
e453f99446
nixos/networkd: Add an assertion for unsupported rstp
2015-02-24 13:09:34 -08:00
William A. Kennington III
35e9d3c112
nixos/zfs: Use the git version for kernels unsupported by 0.6.3
2015-02-11 15:11:56 -08:00
William A. Kennington III
0fa4c9d6d3
nixos/zfs: Fix references to zfs packages now that they are split
2015-02-07 15:07:39 -08:00
Ricardo M. Correia
1b66077205
nixos: Don't do filesystem checks on ZFS or NFS filesystems
2015-01-21 17:39:53 +01:00
William A. Kennington III
8e5ef7da54
nixos/network-interfaces: Fix rstp support
2015-01-14 10:34:28 -08:00
William A. Kennington III
9a7766e054
nixos/network-interfaces: Add mstpd support for bridges
2015-01-07 14:49:24 -08:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
wmertens
5f7530a1d7
zfs hostId: Instructions to derive from machine-id
2014-12-18 22:52:29 +01:00
William A. Kennington III
1036c66d43
nixos/network-interfaces: Add ipv6 gateway support
2014-12-17 17:56:29 -08:00
Shea Levy
10751129d0
Don't require forcing utils to get to lib
2014-12-10 19:28:45 -05:00
Bjørn Forsman
f85ad2d378
nfs-utils: align attrname with pkgname
...
nfsUtils => nfs-utils. Keep copy of old attribute for backward
compatibility.
2014-12-06 17:01:05 +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