gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/top-level: Install 'bootStage2' as 'init' in all non-initrd configs (#441777)

Browse Source
This commit is contained in:
Will Fancher
2025-09-10 14:39:32 +00:00
committed by GitHub
parent a6ba30b044 6b5020dc9c
commit af1b121a0d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2511.section.md
View File

@@ -150,6 +150,8 @@
- The zookeeper project changed their logging tool to logback, therefore `services.zookeeper.logging` option has been updated to expect a logback compatible string. - The zookeeper project changed their logging tool to logback, therefore `services.zookeeper.logging` option has been updated to expect a logback compatible string.
- 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. - 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.
- 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).
- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes: - `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:
- The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured. - The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.
- The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module. - The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.

2
nixos/modules/system/activation/top-level.nix
View File

@@ -12,7 +12,7 @@ let
mkdir $out mkdir $out
${ ${
if config.boot.initrd.systemd.enable then if config.boot.initrd.enable && config.boot.initrd.systemd.enable then
'' ''
cp ${config.system.build.bootStage2} $out/prepare-root cp ${config.system.build.bootStage2} $out/prepare-root
substituteInPlace $out/prepare-root --subst-var-by systemConfig $out substituteInPlace $out/prepare-root --subst-var-by systemConfig $out

12
nixos/modules/virtualisation/lxc-container.nix
View File

@@ -28,9 +28,7 @@
options = { }; options = { };
config = config =
let
initScript = if config.boot.initrd.systemd.enable then "prepare-root" else "init";
in
{ {
boot.isContainer = true; boot.isContainer = true;
boot.postBootCommands = '' boot.postBootCommands = ''
@@ -79,7 +77,7 @@
contents = [ contents = [
{ {
source = config.system.build.toplevel + "/${initScript}"; source = config.system.build.toplevel + "/init";
target = "/sbin/init"; target = "/sbin/init";
} }
# Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn. # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn.
@@ -104,7 +102,7 @@
pseudoFiles = [ pseudoFiles = [
"/sbin d 0755 0 0" "/sbin d 0755 0 0"
"/sbin/init s 0555 0 0 ${config.system.build.toplevel}/${initScript}" "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init"
"/dev d 0755 0 0" "/dev d 0755 0 0"
"/proc d 0555 0 0" "/proc d 0555 0 0"
"/sys d 0555 0 0" "/sys d 0555 0 0"
@@ -113,7 +111,7 @@
system.build.installBootLoader = pkgs.writeScript "install-lxc-sbin-init.sh" '' system.build.installBootLoader = pkgs.writeScript "install-lxc-sbin-init.sh" ''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}
${pkgs.coreutils}/bin/ln -fs "$1/${initScript}" /sbin/init ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init
''; '';
# networkd depends on this, but systemd module disables this for containers # networkd depends on this, but systemd module disables this for containers
@@ -122,7 +120,7 @@
systemd.packages = [ pkgs.distrobuilder.generator ]; systemd.packages = [ pkgs.distrobuilder.generator ];
system.activationScripts.installInitScript = lib.mkForce '' system.activationScripts.installInitScript = lib.mkForce ''
ln -fs $systemConfig/${initScript} /sbin/init ln -fs $systemConfig/init /sbin/init
''; '';
}; };
} }