MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
4724 commits 253 branches 124 tags 5.9 GiB
Commit graph

588 commits

Author SHA1 Message Date
Eelco Dolstra
95d02c0c40 initrd: Remove serio and atkbd 
These modules don't exist as far as I can tell.
 2013-05-15 12:52:15 +02:00
Eelco Dolstra
b3ae70ddb6 initrd: Add ehci_pci and hid_generic 
These are required to get some (all?) USB keyboards to work in recent
kernels.
 2013-05-15 12:52:14 +02:00
Shea Levy
51bc82960a btrfsck doesn't respect any flags 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-13 14:25:48 -04:00
Eelco Dolstra
ffb581c739 Fix suspend in systemd 
Systemd 203 expects the file /etc/systemd/sleep.conf to exist,
otherwise suspend doesn't work.
 2013-05-09 16:26:13 +02:00
Eelco Dolstra
ebac0220d1 systemd.nix: Use environment.etc attribute syntax 2013-05-09 16:26:12 +02:00
Phreedom
6c988a593a Merge pull request #136 from MarcWeber/submit/grubDevice 
s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings
 2013-05-05 07:41:22 -07:00
Shea Levy
17f10f70ad Include xhci_hcd in the initrd for usb3 devices 
Fixes #158, I don't think there is an `xhci' module

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-04 11:35:01 -04:00
Shea Levy
2415787040 gummiboot: Fix bug where old conf scripts for single-digit generations weren't removed 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-04-30 13:03:14 -04:00
Mathijs Kwik
8de00c328a systemd: add "requiredBy" option. 
"require" is a stronger version of "want",
and just like wantedBy allows you to specify this relation in reverse,
requiredBy does the same.

It may seem pointless to be able to specify these stronger relations in
reverse, because if something is really required, you would expect the
other unit to specify this himself.

However, this is still useful for virtual/automatic units (like
devices) that are created by systemd on demand and hence have no unit
file you can alter.
 2013-04-22 14:24:15 +02:00
Lluís Batlle i Rossell
3be4fd3f38 Making grub display 'All configurations', not 'Old' 
That confused some people, as the first generation shown is
the 'current'.
 2013-04-16 11:09:25 +02:00
Marc Weber
9bf073b58b s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings 2013-04-10 23:54:37 +02:00
Eelco Dolstra
86f11dadaa switch-to-configuration: Use full path to sync 2013-04-08 17:34:14 +02:00
Eelco Dolstra
ee29054da1 Create an empty /etc/resolv.conf to shut up nscd 2013-04-03 13:27:41 +02:00
Eelco Dolstra
f40a38b2c8 Remove /etc lock files at boot time 2013-03-31 15:40:13 +02:00
Eelco Dolstra
fbde5e027e Sync after installing the boot loader 
Previously we synced just before calling switch-to-configuration.
That prevents corruption of the Nix store, but it can leave the boot
loader configuration and kernel files in /boot corrupted.  So do the
sync after installing the boot loader.
 2013-03-28 16:11:54 +01:00
Eelco Dolstra
9000fd81d5 Hack: force timers.target to be started 
Usually timers.target is pulled in by basic.target, but we don't
restart basic.target.  So timers.target wouldn't be started when
coming from an older systemd.
 2013-03-28 15:02:11 +01:00
Eelco Dolstra
7ad91f31d6 Add support for systemd timers 2013-03-28 11:54:19 +01:00
Eelco Dolstra
c039e286b9 Set the kernel.poweroff_cmd sysctl 
This allows Xen (and EC2) to power off an instance properly.  We had
this before (see aeb89fc753), but it got
lost in the systemd migration.
 2013-03-27 23:03:37 +01:00
Eelco Dolstra
f3bea050f8 Updates for systemd 198/199 2013-03-27 23:03:37 +01:00
Shea Levy
652e2ab610 "Maintain" the tested job so I get notifications when it fails 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-26 12:35:28 -04:00
Shea Levy
89dd7b0f69 Revert "Don't mount /nix/store ro if it's a mountpoint" 
Now that nixUnstable supports remounting in the "/nix/store is a
mountpoint" case, this is no longer necessary.

This reverts commit f1d48aec43.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-26 12:20:06 -04:00
Nicolas B. Pierron
8b2256686b Merge pull request #123 from MarcWeber/feed-upstream/toList 
replace list by listOf using same style as for attrsOf
 2013-03-23 16:21:21 -07:00
Peter Simons
c5ba924143 Revert "Add /run/nss to LD_LIBRARY_PATH". 
Commit c948494342 exports too many shared
objects into the LD_LIBRARY_PATH, which causes problems with mplayer.
 2013-03-21 11:25:25 +01:00
Marc Weber
f3e6b42258 replace list by listOf using same style as for attrsOf 2013-03-14 17:09:21 +01:00
Peter Simons
8f679fef5b Merge pull request #116 from rickynils/nss 
Add /run/nss to LD_LIBRARY_PATH
 2013-03-13 02:57:32 -07:00
Shea Levy
d67d3b5b6a extraModprobeConfig: set type to types.lines 
This makes it so multiple definitions are merged by adding a newline
between each entry, to avoid the need to add a newline to the end of
every definition of extraModprobeConfig. See #119 for an example of an
issue this has caused.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-12 05:51:45 -04:00
Shea Levy
f1d48aec43 Don't mount /nix/store ro if it's a mountpoint 
In principle this could work, but the current remount logic in nix fails
to remount mountpoints that are root in their own filesystem (as would
be the case with bind-mounting a mountpoint over itself). nixos/nix#98
is aimed at fixing this.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 10:42:34 -05:00
Shea Levy
bc21ccc981 readonly-mountpoint: Remove unusued variable 2013-03-07 19:05:54 -05:00
Shea Levy
6d6d3d4228 readOnlyStore: Don't do a read-only bind-mount of an already read-only store. 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-07 19:00:21 -05:00
Rickard Nilsson
c948494342 Add /run/nss to LD_LIBRARY_PATH 
This fixes issues with glibc-binaries (getent for example) that can't
find NSS modules that are not distributed with glibc.

See this discussion:
http://comments.gmane.org/gmane.linux.distributions.nixos/9940
 2013-03-07 16:54:42 +01:00
Mathijs Kwik
09680dec6a read-only-store functionality should apply even when /nix/store is on a separate filesystem 2013-03-04 22:46:06 +01:00
Mathijs Kwik
134750f6ac gummiboot: fix typo 2013-03-04 22:46:06 +01:00
Mathijs Kwik
e05a37d736 rename deprecated option 2013-03-04 22:46:06 +01:00
Bjørn Forsman
ec2378f07b systemd-logind: fix config file header: [Logind] => [Login] 
man logind.conf clearly states that the header is [Login] (no 'd').
Without this fix services.logind.extraConfig does not take effect
because logind ignores the invalidly named section.
 2013-03-02 19:45:47 +01:00
Bjørn Forsman
08c9a0ad5e Add service.logind.extraConfig option 
So that we can customize systemd-logind in configuration.nix.

Example:
  services.logind.extraConfig = "HandleLidSwitch=ignore";

See man logind.conf for available options.
 2013-03-02 00:24:34 +01:00
Shea Levy
497aeabd23 systemd automatically mounts securityfs (if it's enabled) 2013-02-21 14:22:18 -05:00
Shea Levy
5f29704861 gummiboot-builder.py: Update to latest gummiboot 2013-02-21 12:40:33 -05:00
Shea Levy
e80cfe7d2d gummiboot-builder.py: Not rewriting entries probably doesn't save much time, and is problematic in the case where you delete the latest generation before your rebuild 2013-02-19 20:47:23 -05:00
Shea Levy
6c6d40452f Stage 1 mounts securityfs, so require that in the kernel 2013-02-19 20:47:23 -05:00
Shea Levy
338ef594c7 Add boot.initrd.compressor option 2013-02-19 11:55:39 -05:00
Eelco Dolstra
18e8724e64 Log the configuration when booting / switching 2013-02-18 15:39:47 +01:00
Shea Levy
59a4df3159 Add websockify service 2013-02-14 21:50:41 -05:00
Shea Levy
b669633d63 gummiboot-builder.py: Handle the case where there's no /etc/machine-id. 
Bug hit by add^_ in IRC when installing from the livecd, as there's no /mnt/etc/machine-id
 2013-02-12 10:47:52 -05:00
Eelco Dolstra
979117b6b8 Selectively allow /etc files to be disabled 
For instance, if you don't want NixOS to emit /etc/hosts, you
can say:

  environment.etc.hosts.enable = false;
 2013-02-03 14:28:18 +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
73152e1702 etc.nix: Fix style 2013-02-03 14:28:17 +01:00
Shea Levy
36088abb39 gummiboot-builder: Only read /etc/machine-id once per invocation 2013-02-02 21:16:12 -05:00
Shea Levy
d57df55566 gummiboot-builder: When NIXOS_INSTALL_GRUB is set and efibootmgr is used, prepend the gummiboot entry to the boot entries list 2013-02-02 21:10:09 -05:00
Shea Levy
3f37031c4f Merge branch 'gummiboot' into upstream-master 2013-02-02 00:04:31 -05:00