Commit graph

203 commits

Author SHA1 Message Date
Mathijs Kwik 085ccc8199 btrfs: btrfsck is now actually the same binary as "btrfs"
symlinked to save space.
2013-05-17 09:22:07 +02:00
Shea Levy 2c4db1a6cf Don't copy libz and liblzo2 twice to the initrd
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-14 23:35:10 -04:00
Shea Levy 9b4991d3f4 Fix btrfs in the initrd.
With NixOS/nixpkgs@7761952d06 , btrfs requires libz and liblzo2

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-13 14:16:53 -04:00
Shea Levy 7f7ada53cf Add a basic (currently failing) sanity check for btrfsProgs-in-initrd
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-13 14:07:38 -04:00
Evgeny Egorochkin d6df27277b ZFS: automatically import zpools and mount zfs filesystems.
Patch contributed by Jack Cummings.
2013-05-05 16:36:08 +03:00
Mathijs Kwik 006f328877 virtual network interfaces: make systemd aware of the relation between device and service
If I want to bring down tap0.service (or systemd wants to do this
during a configuration-change which changes the path to tunctl),
openvpn (or other services using tap0) need to be brought down as
well, otherwise tunctl -d is not able to remove the tap0 device,
leaving it in a failed (but "up") state.
2013-04-22 14:24:15 +02:00
Jaka Hudoklin b230153cfd Merge branch 'master' of https://github.com/NixOS/nixos into nameservers
Conflicts:
	modules/tasks/network-interfaces.nix
2013-04-21 20:02:26 +02:00
Jaka Hudoklin 7427639b84 Static nameservers have precedence 2013-04-21 19:48:15 +02:00
Lluís Batlle i Rossell 1caa1b96cb network-interfaces: fixing a cat/EOF piping confusion 2013-04-17 09:10:41 +02:00
Eelco Dolstra 56e678725d Remove Upstart reference 2013-04-11 17:29:34 +02:00
Rickard Nilsson bf2707d359 unionfs-fuse: Fix conditional expressions 2013-04-10 14:06:29 +02:00
Rickard Nilsson b2b221d533 Add unionfs-fuse to system.fsPackages if needed 2013-04-09 16:44:14 +02:00
Marc Weber f3e6b42258 replace list by listOf using same style as for attrsOf 2013-03-14 17:09:21 +01:00
Jack Cummings 60e408dd6b need a newline in extraModprobeConfig 2013-03-11 02:02:10 -07:00
David Guibert ed6e0262e0 bring bridge interfaces up
The bridge is not becoming operational until it is brought into the UP state.
When the bridge is statically configured, this is mandatory.
2013-03-02 10:24:46 +01:00
Lluís Batlle i Rossell 8a7b44a5e7 xfs wants 'crc32c', to be able to mount anything
Like btrfs.
2013-02-27 22:22:12 +01:00
Vladimír Čunát 9de455cf2e Merge pull request #53 from jcumming/zfs.121204
add a zfs module
2013-02-19 11:35:20 -08:00
Eelco Dolstra 46b7ddf402 Add option to disable predictable network interface naming 2013-02-11 16:01:01 +01:00
Eelco Dolstra 1daab1ebf5 environment.etc: Add convenience option 'text'
This allows writing

  environment.etc.hosts.text = "127.0.0.1 localhost";

instead of

  environment.etc.hosts.source = pkgs.writeText "hosts" "127.0.0.1 localhost";
2013-02-03 14:28:18 +01:00
Eelco Dolstra ab238804b8 Turn environment.etc into an attribute set
This provides a more convenient syntax and allows easier overriding.

For example,

  environment.etc = singleton
    { target = "vconsole.conf";
      source = vconsoleConf;
    };

can now be written as

  environment.etc."vconsole.conf".source = vconsoleConf;
2013-02-03 14:28:18 +01:00
Eelco Dolstra 685a901597 Fix description of powerManagement.cpuFreqGovernor 2013-01-24 13:55:59 +01:00
Eelco Dolstra 4d983d4955 Rename ‘system.build.systemd’ to ‘systemd.package’
This makes it cheaper to test a new systemd and is more consistent
with other modules.
2013-01-16 13:17:57 +01:00
Eelco Dolstra ae4e94d9ac Rename ‘boot.systemd’ to ‘systemd’
Suggested by Mathijs Kwik.  ‘boot.systemd’ is a misnomer because
systemd affects more than just booting.  And it saves some typing.
2013-01-16 12:33:18 +01:00
Eelco Dolstra 1541311f06 switch-to-configuration: Stop some target units to ensure proper dependency ordering
This is currently only done for network-interfaces.target, but
it should propably be done for most targets.
2013-01-07 16:06:45 +01:00
Eelco Dolstra 2e035ae042 Hack to prevent <interface>-cfg.service from breaking the default gateway
Restarting <interface>-cfg.service may cause the interface's IP
addresses to be flushed.  If the default gateway goes through that
interface, then the default gateway is deleted.  So we need to
restart network-setup.target.
2013-01-07 15:17:53 +01:00
Lluís Batlle i Rossell 38af598658 Simplifying defaultGatewayWindowSize according to Eelco suggestions 2013-01-06 23:20:48 +01:00
Lluís Batlle i Rossell 9a81748f20 Adding defaultGatewayWindowSize
This allows setting the max tcp window size for the route of
the default gateway (usually the internet access).

It works only for non-DHCP configurations by now.
2013-01-06 22:32:21 +01:00
Shea Levy e34024d998 Refactor common unionfs-fuse initrd prep into a separate module 2012-12-16 12:33:36 -05:00
Eelco Dolstra 745a201814 Check whether /proc/sys/net/ipv6/conf/all/disable_ipv6 exists 2012-12-11 13:14:17 +01:00
Jack Cummings bdee7f502c spl module params in boot.spl.* 2012-12-06 15:12:10 -08:00
Jack Cummings b42d52eeb0 Add the hostid option. Refactor code a bit better for initrd(untested) and system operation. 2012-12-04 11:57:59 -08:00
Jack Cummings d2789791ee Need extraModulePackages for spl and zfs modules. 2012-12-04 11:28:05 -08:00
Jack Cummings a832ce7be1 Add zfs module. 2012-12-04 10:17:54 -08:00
Eelco Dolstra 458f36f5f1 Turn fileSystems into an attribute set
So now you can write

  fileSystems =
    [ { mountPoint = "/";
        device = "/dev/sda1";
      }
    ];

as

  fileSystems."/".device = "/dev/sda1";
2012-11-02 18:02:12 +01:00
Eelco Dolstra 97f087cd44 Turn networking.interfaces into an attribute set
Thus

  networking.interfaces = [ { name = "eth0"; ipAddress = "192.168.15.1"; } ];

can now be written as

  networking.interfaces.eth0.ipAddress = "192.168.15.1";

The old notation still works though.
2012-11-02 17:08:11 +01:00
Eelco Dolstra dd7edefb2c Order mkfs services before the corresponding fsck services 2012-10-31 14:49:09 +01:00
Eelco Dolstra 4764848314 Remove some obsolete options 2012-10-29 21:10:00 +01:00
Eelco Dolstra b6f9e05269 Update NFS client/server modules for systemd 2012-10-24 18:10:58 +02:00
Eelco Dolstra c8628e0293 Don't let interfaces get IPv6 addresses if networking.enableIPv6 is false 2012-10-19 15:41:01 -04:00
Eelco Dolstra b4a1893cdd systemd-vconsole-setup: Don't put the X server in non-raw mode
‘systemd-vconsole-setup’ by default operates on /dev/tty0, the
currently active tty.  Since it puts /dev/tty0 in Unicode or ASCII
mode, if the X server is currently active when it runs, keys such as
Alt-F4 won't reach the X server anymore.  So use /dev/tty1 instead.
2012-10-18 11:58:37 -04:00
Eelco Dolstra 161c837c49 Port automatic filesystem creation to systemd 2012-10-12 17:32:36 -04:00
Eelco Dolstra e8de4455ab Update automatic swapfile creation for systemd 2012-10-12 16:47:29 -04:00
Eelco Dolstra b968244aa1 Move fs.target to filesystems.nix 2012-10-12 15:08:44 -04:00
Peter Simons 7ce9893bef network-interfaces.nix: interfaces that are part of a bridge must be brought 'up' for the bridge to function 2012-10-12 18:14:39 +02:00
Eelco Dolstra e3c1865067 Let the tun services depend on /dev/net/tun 2012-10-11 17:59:41 -04:00
Eelco Dolstra 285f587025 Move non-interface specific initialisation to ‘network-setup.service’
The unit ‘network-interface.service’ has been replaced by
‘network-interfaces.target’.
2012-10-11 16:18:48 -04:00
Eelco Dolstra 1c53b2e299 Don't flush addresses unless necessary
Flushing is bad if the Nix store is on a remote filesystem accessed
over that interface.

http://hydra.nixos.org/build/3184162

Also added a interface option ‘prefixLength’ as a better alternative
to ‘subnetMask’.
2012-10-11 15:36:52 -04:00
Eelco Dolstra bd1071d02b Remove "wants" dependencies on <interface>.service
Instead it's enough to depend on
sys-subsystem-net-devices-<interface>.device, which in turn has a
"wants" dependency on the service (if any) that creates the interface.
2012-10-10 22:47:50 -04:00
Eelco Dolstra d7458b5fc2 Split the monolithic network-interface service into multiple units
For each statically configured interface, we now create a unit
‘<interface>-cfg.service’ which gets started as soon as the network
device comes up.  Similarly, each bridge defined in
‘networking.bridges’ and virtual interface in ‘networking.interfaces’
is created by a service ‘<interface>.service’.

So if we have

  networking.bridges.br0.interfaces = [ "eth0" "eth1" ];
  networking.interfaces =
    [ { name = "br0";
        ipAddress = "192.168.1.1";
      }
    ];

then there will be a unit ‘br0.service’ that depends on
‘sys-subsystem-net-devices-eth0.device’ and
‘sys-subsystem-net-devices-eth1.device’, and a unit ‘br0-cfg.service’
that depends on ‘sys-subsystem-net-devices-br0.device’.
2012-10-10 17:55:42 -04:00
Eelco Dolstra 5d9b3ed12b scsi-link-pm: Don't fail if there are no matching SCSI hosts 2012-10-04 23:25:11 -04:00