Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03a29f61f59e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b40ed80591d6
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 2, 2020

  1. systemd: set withRemote true by default 

    (cherry picked from commit 859a44e)
    @nlewo @flokli
    nlewo authored and flokli committed Nov 2, 2020
    Copy the full SHA
    6419868 View commit details

  2. nixos.tests.systemd: add basic systemd-journal-gatewayd test 

    (cherry picked from commit 81063ee)
    @nlewo @flokli
    nlewo authored and flokli committed Nov 2, 2020
    Copy the full SHA
    53024fb View commit details

  3. Merge pull request #102244 from nlewo/fix-enablehttpgateway 

    Re-enable the Systemd remote support
    @flokli
    flokli authored Nov 2, 2020
    Copy the full SHA
    b40ed80 View commit details
Showing with 10 additions and 3 deletions.
  1. +7 −0 nixos/tests/systemd.nix
  2. +3 −3 pkgs/os-specific/linux/systemd/default.nix
7 changes: 7 additions & 0 deletions nixos/tests/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {
services.journald.extraConfig = "Storage=volatile";
test-support.displayManager.auto.user = "alice";

services.journald.enableHttpGateway = true;

systemd.shutdown.test = pkgs.writeScript "test.shutdown" ''
#!${pkgs.runtimeShell}
PATH=${lib.makeBinPath (with pkgs; [ utillinux coreutils ])}
@@ -168,5 +170,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.succeed("systemctl status systemd-cryptsetup@luks1.service")
machine.succeed("mkdir -p /tmp/luks1")
machine.succeed("mount /dev/mapper/luks1 /tmp/luks1")
with subtest("the systemd-journal-gatewayd service is running"):
machine.succeed(
"${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'"
)
'';
})
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap
, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi
, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
, audit, lz4, bzip2, pcre2
, audit, lz4, bzip2, libmicrohttpd, pcre2
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, iptables, gnu-efi, bashInteractive
, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
@@ -83,7 +83,7 @@ in stdenv.mkDerivation {
buildInputs =
[ linuxHeaders libcap curl.dev kmod xz pam acl
cryptsetup libuuid glib libgcrypt libgpgerror libidn2
pcre2 ] ++
libmicrohttpd pcre2 ] ++
stdenv.lib.optional withKexectools kexectools ++
stdenv.lib.optional withLibseccomp libseccomp ++
[ libffi audit lz4 bzip2 libapparmor
@@ -112,7 +112,7 @@ in stdenv.mkDerivation {
"-Dhostnamed=true"
"-Dnetworkd=true"
"-Dportabled=false"
"-Dremote=false"
"-Dremote=true"
"-Dsysusers=false"
"-Dtimedated=true"
"-Dtimesyncd=true"