--- a/components/gnome/gdm/gdm.p5m	Thu Feb 16 16:13:13 2017 -0800
+++ b/components/gnome/gdm/gdm.p5m	Thu Feb 23 08:08:48 2017 -0800
@@ -53,7 +53,7 @@
 file path=etc/gdm/PostSession/Default mode=0555 preserve=true
 file path=etc/gdm/PreSession/Default mode=0555 preserve=true
 file path=etc/gdm/Xsession mode=0555 preserve=true
-file path=etc/gdm/custom.conf mode=0644 preserve=true
+file path=etc/gdm/custom.conf mode=0644 preserve=renameold
 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 \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/gdm/patches/0020-no-gnome-initial-setup.patch	Thu Feb 23 08:08:48 2017 -0800
@@ -0,0 +1,15 @@
+On some systems, we have seen gdm unable to start because it doesn't find
+the gnome-initial-setup user.  We will never have gnome-initial-setup user
+and shouldn't have gnome-intial-setup start with gdm as the username, so 
+disabling it in the conf file.
+
+--- gdm-3.18.2/data/gdm.conf-custom.in	2017-02-16 13:55:47.788461253 -0800
++++ gdm-3.18.2/data/gdm.conf-custom.in	2017-02-16 13:56:07.933402043 -0800
+@@ -1,6 +1,7 @@
+ # GDM configuration storage
+ 
+ [daemon]
++InitialSetupEnable=False
+ 
+ [security]
+