Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* master: (23 commits) silver-searcher: patch bash completions location shairplay: init at 2016-01-01 ocamlPackages.rope: 0.5 -> 0.6 ocamlPackages.ocaml_gettext: 0.8.7 -> 0.8.8 mupdf: Patch openjpeg version nextcloud-client: fix build after qt updates gstreamer.gst-plugins-bad: Patch openjpeg version silver-searcher: move bash completion to etc/bash-completion.d/ neomutt: use mime.types from dedicated mime-types derivation mime_types: rename to mime-types XMLLibXML: 2.0129 -> 2.0132 fixes failing tests & CVE-2017-10672 nixos/matrix-synapse: remove unused log_file config nixos: run parted with --script option (3rd) nixos: run parted with --script option (2nd) nixos/release: add nixos/tests/switch-test.nix to tested job nixos/system: make switch-to-configuration script pure. nixos/release: include mutableUsers test to release tests. nixos/tests: Add a test for config.users.mutableUsers. corebird: 1.7.2 -> 1.7.3 nixos/matrix-synapse: make home directory configurable ...
- Loading branch information
Showing
24 changed files
with
296 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # Mutable users tests. | ||
|
|
||
| import ./make-test.nix ({ pkgs, ...} : { | ||
| name = "mutable-users"; | ||
| meta = with pkgs.stdenv.lib.maintainers; { | ||
| maintainers = [ gleber ]; | ||
| }; | ||
|
|
||
| nodes = { | ||
| machine = { config, lib, pkgs, ... }: { | ||
| users.mutableUsers = false; | ||
| }; | ||
| mutable = { config, lib, pkgs, ... }: { | ||
| users.mutableUsers = true; | ||
| }; | ||
| }; | ||
|
|
||
| testScript = {nodes, ...}: let | ||
| immutableSystem = nodes.machine.config.system.build.toplevel; | ||
| mutableSystem = nodes.mutable.config.system.build.toplevel; | ||
| in '' | ||
| $machine->start(); | ||
| $machine->waitForUnit("default.target"); | ||
| # Machine starts in immutable mode. Add a user and test if reactivating | ||
| # configuration removes the user. | ||
| $machine->fail("cat /etc/passwd | grep ^foobar:"); | ||
| $machine->succeed("sudo useradd foobar"); | ||
| $machine->succeed("cat /etc/passwd | grep ^foobar:"); | ||
| $machine->succeed("${immutableSystem}/bin/switch-to-configuration test"); | ||
| $machine->fail("cat /etc/passwd | grep ^foobar:"); | ||
| # In immutable mode passwd is not wrapped, while in mutable mode it is | ||
| # wrapped. | ||
| $machine->succeed('which passwd | grep /run/current-system/'); | ||
| $machine->succeed("${mutableSystem}/bin/switch-to-configuration test"); | ||
| $machine->succeed('which passwd | grep /run/wrappers/'); | ||
| ''; | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| # Test configuration switching. | ||
|
|
||
| import ./make-test.nix ({ pkgs, ...} : { | ||
| name = "switch-test"; | ||
| meta = with pkgs.stdenv.lib.maintainers; { | ||
| maintainers = [ gleber ]; | ||
| }; | ||
|
|
||
| nodes = { | ||
| machine = { config, lib, pkgs, ... }: { | ||
| users.mutableUsers = false; | ||
| }; | ||
| other = { config, lib, pkgs, ... }: { | ||
| users.mutableUsers = true; | ||
| }; | ||
| }; | ||
|
|
||
| testScript = {nodes, ...}: let | ||
| originalSystem = nodes.machine.config.system.build.toplevel; | ||
| otherSystem = nodes.other.config.system.build.toplevel; | ||
| in '' | ||
| $machine->succeed("env -i ${originalSystem}/bin/switch-to-configuration test | tee /dev/stderr"); | ||
| $machine->succeed("env -i ${otherSystem}/bin/switch-to-configuration test | tee /dev/stderr"); | ||
| ''; | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
pkgs/applications/networking/cluster/minikube/localkube.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| diff --git a/pkg/minikube/bootstrapper/localkube/localkube.go b/pkg/minikube/bootstrapper/localkube/localkube.go | ||
| index 1c4b5000..c9f120d4 100644 | ||
| --- a/pkg/minikube/bootstrapper/localkube/localkube.go | ||
| +++ b/pkg/minikube/bootstrapper/localkube/localkube.go | ||
| @@ -113,14 +113,9 @@ func (lk *LocalkubeBootstrapper) UpdateCluster(config bootstrapper.KubernetesCon | ||
|
|
||
| copyableFiles := []assets.CopyableFile{} | ||
| var localkubeFile assets.CopyableFile | ||
| - var err error | ||
|
|
||
| //add url/file/bundled localkube to file list | ||
| - lCacher := localkubeCacher{config} | ||
| - localkubeFile, err = lCacher.fetchLocalkubeFromURI() | ||
| - if err != nil { | ||
| - return errors.Wrap(err, "Error updating localkube from uri") | ||
| - } | ||
| + localkubeFile = assets.NewBinDataAsset("out/localkube", "/", "localkube", "0777") | ||
| copyableFiles = append(copyableFiles, localkubeFile) | ||
|
|
||
| // user added files |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.