From eac6287dccd96280f2ec226d1dd7a6614c953c89 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 5 Apr 2016 14:27:02 -0700 Subject: [PATCH] Enable PAM Turn on PAM in product builds - leave it off in the SDK. --- .../profiles/coreos/targets/generic/make.defaults | 4 ++-- .../profiles/coreos/targets/generic/package.use | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 5b35dfee71..60cb43916d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -1,7 +1,7 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -USE="cros-debug acpi usb symlink-usr cryptsetup policykit -pam" +USE="cros-debug acpi usb symlink-usr cryptsetup policykit" USE="${USE} -cros_host -expat -cairo -X -man" USE="${USE} -acl -cracklib -gpm -python -sha512" USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls" @@ -46,4 +46,4 @@ INSTALL_MASK="${INSTALL_MASK} # Remove selinuxenabled because it triggers breakage in Ansible INSTALL_MASK="${INSTALL_MASK} /usr/sbin/selinuxenabled -" \ No newline at end of file +" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index c276236745..926f4d8f1b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -14,7 +14,7 @@ net-analyzer/tcpdump -chroot net-misc/dhcp -server net-misc/iperf threads net-misc/ntp caps -sys-apps/busybox -pam -selinux +sys-apps/busybox -selinux sys-apps/smartmontools minimal sys-block/parted device-mapper sys-fs/lvm2 -lvm1 -readline