summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Peters <fpeters@src.gnome.org>2008-09-22 15:43:39 +0000
committerFrederic Peters <fpeters@src.gnome.org>2008-09-22 15:43:39 +0000
commit88f3248d06fc0b161efb18c6095e00615c6ad0d8 (patch)
treedb3fc2ce44259e78a431033fefe2fff1dfe94cee
parent159b7e66bcad1be81fcf6fb9d6deffdfa81734f3 (diff)
downloadgdm-88f3248d06fc0b161efb18c6095e00615c6ad0d8.tar.gz
don't abort on chown failing when gdm user does not exist. (closes:
* data/Makefile.am: don't abort on chown failing when gdm user does not exist. (closes: #551950) svn path=/trunk/; revision=6541
-rw-r--r--ChangeLog5
-rw-r--r--data/Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d2773de..196d15a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-22 Frederic Peters <fpeters@0d.be>
+
+ * data/Makefile.am: don't abort on chown failing when gdm user does not
+ exist. (closes: #551950)
+
2008-09-17 Brian Cameron <brian.cameron@sun.com>
* config/Xsession.solaris: Use bourne-shell syntax for setting
diff --git a/data/Makefile.am b/data/Makefile.am
index 6e8d8080..e916c12e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -222,7 +222,7 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.pa
$(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path
gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset /
gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries
- chown -R root:gdm $(DESTDIR)$(workingdir)/.gconf.mandatory
+ chown -R root:gdm $(DESTDIR)$(workingdir)/.gconf.mandatory || :
chmod 1750 $(DESTDIR)$(workingdir)/.gconf.mandatory
chmod 1640 $(DESTDIR)$(workingdir)/.gconf.mandatory/*.xml