public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More migration cleanup + todos for cleanup

This commit is contained in:
Parnell Springmeyer 2017-01-29 16:52:23 -06:00
parent 4856b42ab6
commit 0f728de67e
No known key found for this signature in database
GPG Key ID: DCCF89258EAD874A
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/security/wrappers/default.nix
View File

@ -168,10 +168,24 @@ in
WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
# Remove the old /var/setuid-wrappers path from the system... # 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 if [ -d ${config.security.old-wrapperDir} ]; then
rm -rf ${config.security.old-wrapperDir} rm -rf ${config.security.old-wrapperDir}
fi 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 # Get the "/run/wrappers" path, we want to place the tmpdirs
# for the wrappers there # for the wrappers there
parentWrapperDir="$(dirname ${wrapperDir})" parentWrapperDir="$(dirname ${wrapperDir})"