From 0f728de67eeb8b1ebfb0c77418f95f2806f918b5 Mon Sep 17 00:00:00 2001 From: Parnell Springmeyer Date: Sun, 29 Jan 2017 16:52:23 -0600 Subject: More migration cleanup + todos for cleanup --- nixos/modules/security/wrappers/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'nixos/modules/security') diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index cb288fc088097..5ec1a7e620699 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})" -- cgit 1.4.1