summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2015-10-13 18:24:55 +0900
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-14 11:56:35 +0000
commitd2d8f005877468e49a9f4254ee96912ee2344a4a (patch)
tree7f689ccebd9c2c747e07febfaca4b4987b30fae0
parent68a697bc273548fa512f75a7d9904e42f75bfa83 (diff)
downloaddefinitions-d2d8f005877468e49a9f4254ee96912ee2344a4a.tar.gz
Configuring GDM
This commit configures GDM, not perfectly but at least in a way that it works. We've now: o Enabled installation of the xsession file o Enable X o Install basic LFS style PAM configuration o Create the gdm user properly in the system integration hook o Added some post-install-commands to tweak the PAM configuration Change-Id: I668de58734a5d5db8bcb57ae157d212bc3c9598b
-rw-r--r--strata/gnome.morph2
-rw-r--r--strata/gnome/gdm.morph19
2 files changed, 19 insertions, 2 deletions
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 4b2aee14..a7f2a059 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -389,7 +389,7 @@ chunks:
morph: strata/gnome/gdm.morph
repo: upstream:gdm
ref: 494ec8cee5727c37118994d3864c44f36aa454fc
- unpetrify-ref: master
+ unpetrify-ref: 3.18.0
build-depends:
- polkit
- accountsservice
diff --git a/strata/gnome/gdm.morph b/strata/gnome/gdm.morph
index cd5e37e9..342b70d2 100644
--- a/strata/gnome/gdm.morph
+++ b/strata/gnome/gdm.morph
@@ -2,4 +2,21 @@ name: gdm
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --with-plymouth=no
+- |
+ # GDM includes a few stock PAM configurations, we choose the LFS flavor
+ # because of it's simplicity over the others, also it does not require
+ # selinux modules, however we neet to tweak the config a little after install.
+ ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var \
+ --with-selinux=no --with-plymouth=no \
+ --enable-gdm-xsession --with-x --with-default-pam-config=lfs
+post-install-commands:
+# Instead of following LFS PAM config to the letter, we redirect the includes
+# to use the systemd installed all purpose 'system-auth' file
+- sed -i 's/system-account/system-auth/g' "$DESTDIR"/etc/pam.d/gdm*
+- sed -i 's/system-password/system-auth/g' "$DESTDIR"/etc/pam.d/gdm*
+- sed -i 's/system-session/system-auth/g' "$DESTDIR"/etc/pam.d/gdm*
+system-integration:
+ gdm-misc:
+ 00-add-gdm-user:
+ - groupadd -g 21 gdm
+ - useradd -c "GDM Daemon Owner" -d /var/lib/gdm -u 21 -g gdm -s /bin/false gdm