diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-03 18:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-03 18:01:07 +0000 |
| commit | d39be47e172355d00f65ab60a73f41001e42ef92 (patch) | |
| tree | 1a606ca3a5576a13c67d348c838fdb806064cbbd /nixos/modules | |
| parent | 6cead635ad8672767515917c0e789533fe1ce4af (diff) | |
| parent | f3fc8b9fa888afe3fa9d80ffb4ecab7d96fbeb04 (diff) | |
| download | nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.gz nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.bz2 nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.lz nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.xz nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.tar.zst nixlib-d39be47e172355d00f65ab60a73f41001e42ef92.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-base.nix | 11 | ||||
| -rw-r--r-- | nixos/modules/system/activation/top-level.nix | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 6c7ea293e8ac..aecb65b8c576 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,5 +30,16 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; + boot.postBootCommands = '' + for o in $(</proc/cmdline); do + case "$o" in + live.nixos.passwd=*) + set -- $(IFS==; echo $o) + echo "nixos:$2" | ${pkgs.shadow}/bin/chpasswd + ;; + esac + done + ''; + system.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 6751ca3f2ee7..4e2f25cd27fc 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -13,7 +13,7 @@ let # !!! fix this children = mapAttrs (childName: childConfig: (import ../../../lib/eval-config.nix { - inherit baseModules specialArgs; + inherit lib baseModules specialArgs; system = config.nixpkgs.initialSystem; modules = (optionals childConfig.inheritParentConfig modules) |