Commit Graph

85 Commits

Author SHA1 Message Date
aszlig
389e654e03
systemd: Backport fix for detecting VirtualBox.
This is a backport of systemd/systemd@e32886e.

As noted by @ts468 in #9876, systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.

Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).

Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.

Fixes #9876.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
Eelco Dolstra
c34953ed24 systemd: Backport some journalctl performance improvements
Before:

$ time journalctl > /dev/null

real    6m12.470s
user    5m51.439s
sys     0m19.265s

After:

real    0m40.067s
user    0m37.717s
sys     0m2.383s

Before:

$ time journalctl --since '2015-08-01' _TRANSPORT=kernel

real    1m9.817s
user    0m13.318s
sys     0m56.626s

After:

real    0m0.689s
user    0m0.521s
sys     0m0.221s
2015-09-08 14:25:55 +02:00
Eelco Dolstra
3c114b827e systemd: Update URL to the NixOS fork 2015-08-24 14:16:59 +02:00
Eelco Dolstra
9a75bafcda systemd-timesyncd: Use NTP servers from our own ntp.org pool
(cherry picked from commit 01dc343c2c)

Conflicts:
	pkgs/os-specific/linux/systemd/default.nix
2015-07-22 12:27:50 +02:00
Eelco Dolstra
e7feb89158 systemd: Fix another build failure hidden by #7524 2015-05-13 18:17:25 +02:00
Eelco Dolstra
e229dbdb4e systemd: Drop dependency on sysvtools 2015-04-20 11:34:00 +02:00
William A. Kennington III
ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Eelco Dolstra
e47ed98f9b systemd: Apply upstream fixes
In particular, upstream commit 3072eecf3c714e3ed88c882623c40aca15445f64
fixes 15-character network interface names (as generated by ID_NET_NAME_MAC).
2014-12-19 15:07:37 +01:00
Shea Levy
e3825b47ec systemd: read units from /etc/systemd-mutable
This allows for persistent units managed outside of configuration.nix
2014-12-18 17:08:04 -05:00
Aristid Breitkreuz
b216e2b8e6 systemd-nspawn: Ignore existing directories when trying to create mount-points (#4989) 2014-11-24 22:43:54 +01:00
William A. Kennington III
745c2e9d73 systemd: Enable networking features 2014-11-19 13:26:25 -08:00
William A. Kennington III
1d30b4aabd systemd: Patch systemd-journald.service to be Type=notify
https://bugs.freedesktop.org/show_bug.cgi?id=85871
https://bugzilla.redhat.com/show_bug.cgi?id=1159641
2014-11-16 02:01:43 -08:00
Eelco Dolstra
884ff252fd systemd: Update to 217 2014-11-04 15:43:12 +01:00
Eelco Dolstra
891657b634 systemd: Drop unnecessary dependency 2014-08-24 10:04:55 +02:00
Eelco Dolstra
84fa62b4f3 systemd: Build manpages 2014-08-24 09:59:26 +02:00
Eelco Dolstra
c23bf4ec74 systemd: Update to 216 2014-08-23 23:28:03 +02:00
Jaka Hudoklin
71b923fa74 systemd: fix python support 2014-05-17 12:13:29 +02:00
Eelco Dolstra
24cbe874d6 systemd-journal-flush: Require /var/log/journal rather than all filesystems
Backport: 14.04
2014-05-05 16:47:43 +02:00
Eelco Dolstra
014fe1a3c3 sysinit.target: Don't depend on systemd-tmpfiles-setup.service
systemd-tmpfiles-setup.service pulls in local-fs.target, which
interferes with NixOps' send-keys feature (since sshd.service depends
indirectly on sysinit.target). Since in NixOS we don't use
systemd-tmpfiles for creating files (that's done by activation scripts
and preStart scripts), it's not a problem to start it a bit later.

Backport: 14.04
2014-05-05 16:47:02 +02:00
Eelco Dolstra
cb45ecad34 systemd: Look for fsck.* in the right place
Fixes #2464.
2014-05-01 14:32:58 +02:00
Eelco Dolstra
fb3629df49 systemd: Re-allow Restart=yes with Type=oneshot 2014-04-22 23:53:21 +02:00
Eelco Dolstra
7ea51b1c6c Enable kmod-static-nodes.service
This creates static device nodes such as /dev/fuse or
/dev/snd/seq. The kernel modules for these devices will be loaded on
demand when the device node is opened.
2014-04-17 14:35:05 +02:00
Eelco Dolstra
2503e7e0c8 systemd: Apply patch to make container logins work again 2014-04-16 18:15:48 +02:00
Eelco Dolstra
c81565f6cf Remove hack for using upstream getty units
Also, enable the container-getty@ unit so that "machinectl login"
works.
2014-04-16 16:11:17 +02:00
Eelco Dolstra
19d4e40dfc systemd: Build on i686-linux 2014-04-16 15:25:37 +02:00
Eelco Dolstra
0ac322c7a0 systemd-nspawn: Fix starting NixOS containers 2014-04-16 11:34:34 +02:00
Eelco Dolstra
ee9c068b0c systemd: Update to 212
Note that systemd no longer depends on dbus, so we're rid of the
cyclic dependency problem between systemd and dbus.

This commit incorporates from wkennington's systemd branch
(203dcff45002a63f6be75c65f1017021318cc839,
1f842558a95947261ece66f707bfa24faf5a9d88).
2014-04-16 00:59:26 +02:00
Jaka Hudoklin
70a4c7b1df nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
- Make dhcp work, use dhcpcd without udev in container
- Make login shell work, patch getty to not wait for /dev/tty0
- Make ssh work, sshd/pam do not start session
2014-03-24 23:59:50 +01:00
Jaka Hudoklin
ae9c22df3f systemd: enable journal http gateway by adding libmicrohttp 2014-02-06 16:18:25 +01:00
Jaka Hudoklin
09dd6a64fc systemd: add optional python support 2014-02-06 16:18:24 +01:00
Eelco Dolstra
d55b8a10ee systemd: Apply a bunch of upstream fixes
For all changes relative to v203, see
https://github.com/edolstra/systemd/tree/nixos-v203.

Fixes #1072.
2013-10-14 12:47:05 +02:00
Eelco Dolstra
e65ff3b72a systemd: Prevent privilege escalation via polkit
Cherry-picked from upstream.  Also applied a fix for the CPUShares
configuration option while I'm at it.

CVE-2013-4327
2013-09-30 13:30:15 +02:00
Eelco Dolstra
7216b3c844 systemd: Add kexec support 2013-09-16 17:51:18 +02:00
Vladimír Čunát
afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Eelco Dolstra
2e77679b0b systemd: Start ctrl-alt-del.target irreversibly
This fixes hangs during EC2 reboots (which are implemented by sending
a ctrl-alt-del to the instance).
2013-05-07 14:34:48 +02:00
Eelco Dolstra
0dfb9ecc35 systemd: Update to 203 2013-05-07 14:34:48 +02:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Bjørn Forsman
7894a6fa27 systemd: patch hardcoded "/bin/cat" in systemd-cat
Without this patch, systemd-cat doesn't work here:

$ echo "hello world" | systemd-cat
Failed to execute process: No such file or directory
2013-04-24 23:46:09 +02:00
Vladimír Čunát
fe1bd1a73c tarball: move assertion in systemd
Now the assertion doesn't trigger on systemd.headers
which is needed for dbus.libs.

This should fix the tarball job (I don't have enough RAM to test it).
2013-04-24 09:03:30 +00:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Eelco Dolstra
4a429f5276 systemd: Update to 201
Fixes NixOS/nixos#135 and NixOS/nixos#126.
2013-04-12 14:33:41 +02:00
Vladimír Čunát
dec718acb6 systemd: minor update, changes for dbus split
New version with upstreamed changes from @edolstra :-)
2013-04-04 22:00:58 +02:00
Eelco Dolstra
e657e1b57e systemd: Update to 200 2013-03-31 16:16:07 +02:00
Eelco Dolstra
2ef559c513 systemd: Enable the firmware loader in udev
It's needed in kernels < 3.8.
2013-03-27 23:00:03 +01:00
Eelco Dolstra
3300479c74 systemd: Update to 199
This incorporates some changes from
eb64a2f562.
2013-03-27 23:00:02 +01:00
Eelco Dolstra
1c23150eb0 Port my nss_myhostname patches to systemd 2013-02-04 15:49:20 +01:00
Marc Weber
5784fa5f79 for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work 2013-02-04 12:07:37 +01:00