···

       
150
       
150
       
 
       
- The zookeeper project changed their logging tool to logback, therefore `services.zookeeper.logging` option has been updated to expect a logback compatible string.

     

       
151
       
151
       
 
       
- The `dovecot` systemd service was renamed from `dovecot2` to `dovecot`. The former is now just an alias. Update any overrides on the systemd unit to the new name.

     

       
152
       
152
       
 
       


     

       
153
       
153
       
+
       
- Configurations with `boot.initrd.systend.enable && !boot.initrd.enable` will have their `init` script at `$toplevel/init` instead of `$toplevel/prepare-root`. This is because it does not make sense for systemd stage 1 to affect the `init` script when stage 1 is entirely disabled (e.g. containers).

     

       
154
       
154
       
+
       


     

       
153
       
155
       
 
       
- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:

     

       
154
       
156
       
 
       
  - The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.

     

       
155
       
157
       
 
       
  - The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.

     

···

       
12
       
12
       
 
       
    mkdir $out

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
    ${

     

       
15
       
15
       
-
       
      if config.boot.initrd.systemd.enable then

     

       
15
       
15
       
+
       
      if config.boot.initrd.enable && config.boot.initrd.systemd.enable then

     

       
16
       
16
       
 
       
        ''

     

       
17
       
17
       
 
       
          cp ${config.system.build.bootStage2} $out/prepare-root

     

       
18
       
18
       
 
       
          substituteInPlace $out/prepare-root --subst-var-by systemConfig $out

     

···

       
28
       
28
       
 
       
  options = { };

     

       
29
       
29
       
 
       


     

       
30
       
30
       
 
       
  config =

     

       
31
       
31
       
-
       
    let

     

       
32
       
32
       
-
       
      initScript = if config.boot.initrd.systemd.enable then "prepare-root" else "init";

     

       
33
       
33
       
-
       
    in

     

       
31
       
31
       
+
       


     

       
34
       
32
       
 
       
    {

     

       
35
       
33
       
 
       
      boot.isContainer = true;

     

       
36
       
34
       
 
       
      boot.postBootCommands = ''

     
···

       
79
       
77
       
 
       


     

       
80
       
78
       
 
       
        contents = [

     

       
81
       
79
       
 
       
          {

     

       
82
       
82
       
-
       
            source = config.system.build.toplevel + "/${initScript}";

     

       
80
       
80
       
+
       
            source = config.system.build.toplevel + "/init";

     

       
83
       
81
       
 
       
            target = "/sbin/init";

     

       
84
       
82
       
 
       
          }

     

       
85
       
83
       
 
       
          # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn.

     
···

       
104
       
102
       
 
       


     

       
105
       
103
       
 
       
        pseudoFiles = [

     

       
106
       
104
       
 
       
          "/sbin d 0755 0 0"

     

       
107
       
107
       
-
       
          "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/${initScript}"

     

       
105
       
105
       
+
       
          "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init"

     

       
108
       
106
       
 
       
          "/dev d 0755 0 0"

     

       
109
       
107
       
 
       
          "/proc d 0555 0 0"

     

       
110
       
108
       
 
       
          "/sys d 0555 0 0"

     
···

       
113
       
111
       
 
       


     

       
114
       
112
       
 
       
      system.build.installBootLoader = pkgs.writeScript "install-lxc-sbin-init.sh" ''

     

       
115
       
113
       
 
       
        #!${pkgs.runtimeShell}

     

       
116
       
116
       
-
       
        ${pkgs.coreutils}/bin/ln -fs "$1/${initScript}" /sbin/init

     

       
114
       
114
       
+
       
        ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init

     

       
117
       
115
       
 
       
      '';

     

       
118
       
116
       
 
       


     

       
119
       
117
       
 
       
      # networkd depends on this, but systemd module disables this for containers

     
···

       
122
       
120
       
 
       
      systemd.packages = [ pkgs.distrobuilder.generator ];

     

       
123
       
121
       
 
       


     

       
124
       
122
       
 
       
      system.activationScripts.installInitScript = lib.mkForce ''

     

       
125
       
125
       
-
       
        ln -fs $systemConfig/${initScript} /sbin/init

     

       
123
       
123
       
+
       
        ln -fs $systemConfig/init /sbin/init

     

       
126
       
124
       
 
       
      '';

     

       
127
       
125
       
 
       
    };

     

       
128
       
126
       
 
       
}