diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-01-17 05:00:02 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-01-17 05:00:02 +0800 |
| commit | 2933ac51a76891f46dbb648d9bf786b1daa06ad1 (patch) | |
| tree | f9d899d04c37d9d3f658edd2a420737aac6c44ac | |
| parent | afaa4085a68c95147ef4afeb494cbfc0e78def28 (diff) | |
| download | marcuscom-ports-2933ac51a76891f46dbb648d9bf786b1daa06ad1.tar marcuscom-ports-2933ac51a76891f46dbb648d9bf786b1daa06ad1.tar.gz marcuscom-ports-2933ac51a76891f46dbb648d9bf786b1daa06ad1.tar.bz2 marcuscom-ports-2933ac51a76891f46dbb648d9bf786b1daa06ad1.tar.lz marcuscom-ports-2933ac51a76891f46dbb648d9bf786b1daa06ad1.tar.xz marcuscom-ports-2933ac51a76891f46dbb648d9bf786b1daa06ad1.tar.zst marcuscom-ports-2933ac51a76891f46dbb648d9bf786b1daa06ad1.zip | |
Pick a better home directory for the gdm user. This should avoid problems
where /var/gdm is unwritable, and is more inline with official GNOME
instructions.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10133 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm/pkg-install | 11 | ||||
| -rw-r--r-- | x11/gdm/pkg-plist | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 55ec42881..3608e27ec 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.94 2008/01/15 06:14:44 mezz Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.95 2008/01/15 22:30:33 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.21.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index cfcc5f743..29d467924 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -25,12 +25,12 @@ POST-INSTALL) if ${PW} user show "${USER}" 2>/dev/null; then echo "You already have a user \"${USER}\", so I will use it." uhome=`${PW} user show ${USER} | awk -F: '{print $9}'` - if [ x"${uhome}" = x"/nonexistent" ]; then - ${PW} usermod ${USER} -d "/var/gdm" + if [ x"${uhome}" = x"/nonexistent" -o x"${uhome}" = x"/var/gdm" ]; then + ${PW} usermod ${USER} -d "${PKG_PREFIX}/etc/gdm/home" fi else if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/var/gdm" -s /sbin/nologin -c "GNOME Display Manager" + -d "${PKG_PREFIX}/etc/gdm/home" -s /sbin/nologin -c "GNOME Display Manager" then echo "Added user \"${USER}\"." else @@ -39,8 +39,6 @@ POST-INSTALL) fi fi ${MKDIR} -p /var/gdm - ${MKDIR} -p /var/gdm/.gconf - ${MKDIR} -p /var/gdm/.gconfd ${MKDIR} -p /var/log/gdm ${CHMOD} 0755 /var/log/gdm ${CHOWN} root:wheel /var/log/gdm @@ -51,6 +49,9 @@ POST-INSTALL) ${MKDIR} -p /var/lib/gdm ${CHMOD} 1770 /var/lib/gdm ${CHOWN} root:${GROUP} /var/lib/gdm + ${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home + ${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home + ${CHMOD} 0755 ${PKG_PREFIX}/etc/gdm/home ${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions exit 0 diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index 65ba69c6d..00f171bef 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -149,7 +149,8 @@ share/pixmaps/nohost.png @dirrm etc/gdm/PostSession @dirrm etc/gdm/PostLogin @dirrm etc/gdm/Init -@dirrm etc/gdm +@unexec rmdir %D/etc/gdm/home 2> /dev/null || /usr/bin/true +@dirrmtry etc/gdm @dirrmtry etc/dm/Sessions @dirrmtry etc/dm @dirrm lib/gdm/settings/plugins @@ -160,7 +161,7 @@ share/pixmaps/nohost.png @dirrmtry share/log @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true -@unexec /bin/rm -rf /var/lig/gdm 2>/dev/null || /usr/bin/true +@unexec /bin/rm -rf /var/lib/gdm 2>/dev/null || /usr/bin/true @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu @dirrmtry share/locale/zh_HK/LC_MESSAGES |