diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 16:52:23 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 16:52:23 -0600 |
| commit | 0f728de67eeb8b1ebfb0c77418f95f2806f918b5 (patch) | |
| tree | 17e07cc154ec15fcef7b62e350500325c78ec90c /nixos/modules/security/wrappers | |
| parent | 4856b42ab69beb882414664551f1ca879d379936 (diff) | |
| download | nixpkgs-0f728de67eeb8b1ebfb0c77418f95f2806f918b5.tar nixpkgs-0f728de67eeb8b1ebfb0c77418f95f2806f918b5.tar.gz nixpkgs-0f728de67eeb8b1ebfb0c77418f95f2806f918b5.tar.bz2 nixpkgs-0f728de67eeb8b1ebfb0c77418f95f2806f918b5.tar.lz nixpkgs-0f728de67eeb8b1ebfb0c77418f95f2806f918b5.tar.xz nixpkgs-0f728de67eeb8b1ebfb0c77418f95f2806f918b5.tar.zst nixpkgs-0f728de67eeb8b1ebfb0c77418f95f2806f918b5.zip | |
More migration cleanup + todos for cleanup
Diffstat (limited to 'nixos/modules/security/wrappers')
| -rw-r--r-- | nixos/modules/security/wrappers/default.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index cb288fc0880..5ec1a7e6206 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -168,10 +168,24 @@ in WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin # Remove the old /var/setuid-wrappers path from the system... + # + # TDOO: this is only necessary for ugprades 16.09 => 17.x; + # this conditional removal block needs to be removed after + # the release. if [ -d ${config.security.old-wrapperDir} ]; then rm -rf ${config.security.old-wrapperDir} fi + # Remove the old /run/setuid-wrappers-dir path from the + # system as well... + # + # TDOO: this is only necessary for ugprades 16.09 => 17.x; + # this conditional removal block needs to be removed after + # the release. + if [ -d /run/setuid-wrappers-dir ]; then + rm -rf /run/setuid-wrappers-dir + fi + # Get the "/run/wrappers" path, we want to place the tmpdirs # for the wrappers there parentWrapperDir="$(dirname ${wrapperDir})" |