--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gdm/files/gdm-autologin	Fri Oct 07 22:43:37 2016 -0700
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+# PAM configuration
+#
+# GDM Autologin (explicit because of pam_allow).
+#
+auth  required    pam_unix_cred.so.1
+auth  sufficient  pam_allow.so.1
+account  sufficient  pam_allow.so.1

--- a/components/gnome/gdm/gdm.p5m	Sun Oct 09 11:59:08 2016 -0700
+++ b/components/gnome/gdm/gdm.p5m	Fri Oct 07 22:43:37 2016 -0700
@@ -56,6 +56,8 @@
 file path=etc/gdm/custom.conf mode=0644 preserve=true
 file files/gdm-launch-environment.pam path=etc/gdm/gdm-launch-environment.pam \
     preserve=renamenew
+file files/gdm-autologin path=etc/pam.d/gdm-autologin \
+    original_name=system/core-os:etc/pam.d/gdm-autologin preserve=renamenew
 file files/gdm.auth_attr \
     path=etc/security/auth_attr.d/system:display-manager:gdm
 file files/gdm.prof_attr \
@@ -274,6 +276,8 @@
 license gdm.license license="GPL v2, LGPL v2, MIT"
 
 
+# Need a version of core-os with etc/pam.d/gdm-autologin removed
+depend type=optional fmri=pkg:/system/[email protected]
 depend type=require fmri=__TBD \
     pkg.debug.depend.file=etc/X11/xinit/xinitrc.d/0011.env
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/Xserver