summary refs log tree commit diff
path: root/nixos/modules/installer
diff options
context:
space:
mode:
authorParnell Springmeyer <parnell@awakenetworks.com>2016-07-15 18:15:08 -0500
committerParnell Springmeyer <parnell@awakenetworks.com>2016-09-01 19:16:36 -0500
commit81b33eb46645b1bd3ab5029c0ca2012a24902bb0 (patch)
treeadec44051f272b30de06639772b043e4a05acbe5 /nixos/modules/installer
parent79e81aa31bc7a0fa88507c06f21b41fbbd1cb863 (diff)
downloadnixlib-81b33eb46645b1bd3ab5029c0ca2012a24902bb0.tar
nixlib-81b33eb46645b1bd3ab5029c0ca2012a24902bb0.tar.gz
nixlib-81b33eb46645b1bd3ab5029c0ca2012a24902bb0.tar.bz2
nixlib-81b33eb46645b1bd3ab5029c0ca2012a24902bb0.tar.lz
nixlib-81b33eb46645b1bd3ab5029c0ca2012a24902bb0.tar.xz
nixlib-81b33eb46645b1bd3ab5029c0ca2012a24902bb0.tar.zst
nixlib-81b33eb46645b1bd3ab5029c0ca2012a24902bb0.zip
security: Updating the machinery for creating the wrapper programs dir in var and updating ping and ping6 for changed config interface.
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 2190cac53d9e..4da752e19050 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -328,8 +328,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
 
     # Skip special filesystems.
     next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs";
-    next if $mountPoint eq "/var/setuid-wrappers";
-    next if $mountPoint eq "/var/setcap-wrappers";
+    next if $mountPoint eq "/var/permissions-wrappers";
 
     # Skip the optional fields.
     my $n = 6; $n++ while $fields[$n] ne "-"; $n++;