Commit 59e37267 authored by nikstur's avatar nikstur
Browse files

nixos/activation: replace var activationScript via tmpfiles

parent 3c1c4b65

nixos/modules/system/activation/activation-script.nix

+5 −16
Original line number Diff line number Diff line
@@ -233,23 +233,12 @@ in 
  config = {



    system.activationScripts.stdio = ""; # obsolete

    system.activationScripts.var = ""; # obsolete



    system.activationScripts.var =

      ''

        # Various log/runtime directories.



        mkdir -p /var/tmp

        chmod 1777 /var/tmp



        # Empty, immutable home directory of many system accounts.

        mkdir -p /var/empty

        # Make sure it's really empty

        ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true

        find /var/empty -mindepth 1 -delete

        chmod 0555 /var/empty

        chown root:root /var/empty

        ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true

      '';

    systemd.tmpfiles.rules = [

      "D /var/empty 0555 root root -"

      "h /var/empty - - - - +i"

    ];



    system.activationScripts.usrbinenv = if config.environment.usrbinenv != null

      then ''

nixos/tests/activation/var.nix

0 → 100644
+18 −0
Original line number Diff line number Diff line 
{ lib, ... }:



{



  name = "activation-var";



  meta.maintainers = with lib.maintainers; [ nikstur ];



  nodes.machine = { };



  testScript = ''

    assert machine.succeed("stat -c '%a' /var/tmp") == "1777\n"

    assert machine.succeed("stat -c '%a' /var/empty") == "555\n"

    assert machine.succeed("stat -c '%U' /var/empty") == "root\n"

    assert machine.succeed("stat -c '%G' /var/empty") == "root\n"

    assert "i" in machine.succeed("lsattr -d /var/empty")

  '';

}

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ in { 
  esphome = handleTest ./esphome.nix {};

  etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };

  activation = pkgs.callPackage ../modules/system/activation/test.nix { };

  activation-var = runTest ./activation/var.nix;

  etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};

  etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};

  etebase-server = handleTest ./etebase-server.nix {};