profiles: Move PROD_INSTALL_MASK list into prod profile

The variable PROD_INSTALL_MASK is no longer used, we switch to the prod
portage profile instead these days.
This commit is contained in:
Michael Marineau 2014-09-17 15:03:52 -07:00
parent 2538fa8ed7
commit 0c62fba05b
2 changed files with 24 additions and 29 deletions

View File

@ -23,29 +23,3 @@ INSTALL_MASK="${INSTALL_MASK}
INSTALL_MASK="${INSTALL_MASK}
/etc/sudoers
"
# Restrictive mask for production images.
# TODO(marineam): Perhaps later move this to a generic/production profile.
PROD_INSTALL_MASK="${INSTALL_MASK}
*.a *.la *.h *.hpp
/etc/sandbox.d
/usr/include
/usr/lib/debug
/usr/lib*/pkgconfig
/usr/share/aclocal*
/usr/share/awk
/usr/share/gdb
/usr/share/gettext
/usr/share/gobject-introspection-1.0
/usr/share/pkgconfig
/usr/share/readline
/usr/src
"
# Exclude nmap from prod image, we just want ncat/nping in there
# Also remove ncat's second ca-bundle.crt, just use the system's
PROD_INSTALL_MASK="${PROD_INSTALL_MASK}
/usr/bin/nmap
/usr/share/ncat
/usr/share/nmap
"

View File

@ -1,6 +1,27 @@
# Copyright (c) 2014 The CoreOS Authors. All rights reserved.
# Distributed under the terms of the GNU General Public License v2
# default to the full PROD_INSTALL_MASK
# TODO: after transitioning that list will just be defined here.
INSTALL_MASK="${PROD_INSTALL_MASK}"
# Restrictive mask for production images.
INSTALL_MASK="${INSTALL_MASK}
*.a *.la *.h *.hpp
/etc/sandbox.d
/usr/include
/usr/lib/debug
/usr/lib*/pkgconfig
/usr/share/aclocal*
/usr/share/awk
/usr/share/gdb
/usr/share/gettext
/usr/share/gobject-introspection-1.0
/usr/share/pkgconfig
/usr/share/readline
/usr/src
"
# Exclude nmap from prod image, we just want ncat/nping in there
# Also remove ncat's second ca-bundle.crt, just use the system's
INSTALL_MASK="${INSTALL_MASK}
/usr/bin/nmap
/usr/share/ncat
/usr/share/nmap
"