diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-21 13:40:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 13:40:15 +0100 |
| commit | f2ff646e590a0475a2b6da8ed582b0fa125279b1 (patch) | |
| tree | 6f653bc37c5e4543191212f88221f64af5070df0 /nixos/modules/security | |
| parent | a20fa00de71055ec4cce5686031bf6f464fcf6b2 (diff) | |
| parent | 4c751ced376e0042ddd4f2aa8bd40754b9ea8926 (diff) | |
| download | nixlib-f2ff646e590a0475a2b6da8ed582b0fa125279b1.tar nixlib-f2ff646e590a0475a2b6da8ed582b0fa125279b1.tar.gz nixlib-f2ff646e590a0475a2b6da8ed582b0fa125279b1.tar.bz2 nixlib-f2ff646e590a0475a2b6da8ed582b0fa125279b1.tar.lz nixlib-f2ff646e590a0475a2b6da8ed582b0fa125279b1.tar.xz nixlib-f2ff646e590a0475a2b6da8ed582b0fa125279b1.tar.zst nixlib-f2ff646e590a0475a2b6da8ed582b0fa125279b1.zip | |
Merge pull request #23641 from awakenetworks/parnell/fix-wrapper-migration
security-wrapper: Don't remove the old paths yet as that can create migration pain
Diffstat (limited to 'nixos/modules/security')
| -rw-r--r-- | nixos/modules/security/wrappers/default.nix | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 65d875c3a375..0aca39fd6bed 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -177,25 +177,6 @@ in # programs to be wrapped. WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin - # Remove the old /var/setuid-wrappers path from the system... - # - # TODO: this is only necessary for ugprades 16.09 => 17.x; - # this conditional removal block needs to be removed after - # the release. - if [ -d /var/setuid-wrappers ]; then - rm -rf /var/setuid-wrappers - fi - - # Remove the old /run/setuid-wrappers-dir path from the - # system as well... - # - # TODO: 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-wrapper-dirs ]; then - rm -rf /run/setuid-wrapper-dirs - fi - # We want to place the tmpdirs for the wrappers to the parent dir. wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) chmod a+rx $wrapperDir |