From 97d58f7bd3bbf293bc6ff55ed3ba6d1c8181e23f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 6 Mar 2019 12:49:39 +0100 Subject: [PATCH] Rename nixos.useInit -> nixos.useSystemd --- examples/full-nixos/arion-compose.nix | 2 +- src/nix/modules/service/nixos-init.nix | 6 +++--- src/nix/modules/service/nixos.nix | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/full-nixos/arion-compose.nix b/examples/full-nixos/arion-compose.nix index 02c9973..03eb78f 100644 --- a/examples/full-nixos/arion-compose.nix +++ b/examples/full-nixos/arion-compose.nix @@ -1,6 +1,6 @@ { docker-compose.services.webserver = { pkgs, ... }: { - nixos.useInit = true; + nixos.useSystemd = true; nixos.configuration.services.nginx.enable = true; nixos.configuration.services.nginx.virtualHosts.localhost.root = "${pkgs.nix.doc}/share/doc/nix/manual"; service.useHostStore = true; diff --git a/src/nix/modules/service/nixos-init.nix b/src/nix/modules/service/nixos-init.nix index 39ae4f6..2b37db8 100644 --- a/src/nix/modules/service/nixos-init.nix +++ b/src/nix/modules/service/nixos-init.nix @@ -7,18 +7,18 @@ let in { options = { - nixos.useInit = lib.mkOption { + nixos.useSystemd = lib.mkOption { type = types.bool; default = false; description = '' - When enabled, call the NixOS init system. + When enabled, call the NixOS systemd-based init system. Configure NixOS with nixos.configuration. ''; }; }; - config = lib.mkIf (config.nixos.useInit) { + config = lib.mkIf (config.nixos.useSystemd) { nixos.configuration.imports = [ ../nixos/container-systemd.nix (pkgs.path + "/nixos/modules/profiles/minimal.nix") diff --git a/src/nix/modules/service/nixos.nix b/src/nix/modules/service/nixos.nix index fc18898..2cfc344 100644 --- a/src/nix/modules/service/nixos.nix +++ b/src/nix/modules/service/nixos.nix @@ -18,7 +18,7 @@ in This option is unused by default, because not all images use NixOS. - One way to use this is to enable nixos.useInit, but the + One way to use this is to enable nixos.useSystemd, but the NixOS configuration can be used in other ways. ''; }; @@ -31,7 +31,7 @@ in This option is unused by default, because not all images use NixOS. - One way to use this is to enable nixos.useInit, but the + One way to use this is to enable nixos.useSystemd, but the NixOS configuration can be used in other ways. ''; }; @@ -44,7 +44,7 @@ in This option is unused by default, because not all images use NixOS. - One way to use this is to enable nixos.useInit, but the + One way to use this is to enable nixos.useSystemd, but the NixOS configuration can be used in other ways. ''; };