From 3b8f46ccc2943cae0fda34e70f624eeead0cefdf Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 3 May 2011 06:46:10 +0000 Subject: Fix bug 288852, vt detection finally works properly, remove old (Portage version: 2.1.9.46/cvs/Linux x86_64) --- gnome-base/gdm/ChangeLog | 8 +- .../gdm/files/gdm-2.32.0-fix-vt-problems.patch | 195 ++++++++++++++++++++ gnome-base/gdm/gdm-2.32.0.ebuild | 200 --------------------- gnome-base/gdm/gdm-2.32.1-r1.ebuild | 200 +++++++++++++++++++++ 4 files changed, 402 insertions(+), 201 deletions(-) create mode 100644 gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch delete mode 100644 gnome-base/gdm/gdm-2.32.0.ebuild create mode 100644 gnome-base/gdm/gdm-2.32.1-r1.ebuild (limited to 'gnome-base/gdm') diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index c74e302b0401..c5b759d11f7b 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.337 2011/03/28 21:41:26 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.338 2011/05/03 06:46:10 nirbheek Exp $ + +*gdm-2.32.1-r1 (03 May 2011) + + 03 May 2011; Nirbheek Chauhan -gdm-2.32.0.ebuild, + +files/gdm-2.32.0-fix-vt-problems.patch, +gdm-2.32.1-r1.ebuild: + Fix bug 288852, vt detection finally works properly, remove old *gdm-2.32.1 (28 Mar 2011) diff --git a/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch b/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch new file mode 100644 index 000000000000..b7ceb49c3caf --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch @@ -0,0 +1,195 @@ +From 64002e623fea54ab10040206d164c5fdee4a43d2 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan +Date: Fri, 15 Apr 2011 22:13:44 +0530 +Subject: [PATCH] Fix VT grab race with getty causing X to grab the wrong VT + +On bootup, if X is spawned without any args, it'll take up the first unused VT. +If GDM starts up before gettys are spawned, X takes up VT1 or VT2 depending on +the init system and bootsplash. + +This is problematic because afterwards getty will come up underneath X, and +cause keyboard problems and eventually crash X. + +So we read /etc/inittab, check for open VTs, compare the two values, and take +the conservative one. +--- + configure.ac | 4 ++ + daemon/Makefile.am | 1 + + daemon/gdm-server.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 110 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ca0f8bb..b9e7462 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -302,6 +302,10 @@ AC_CHECK_TYPE(socklen_t,, + AC_CHECK_HEADERS(sys/sockio.h) + AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv]) + ++dnl Needed for querying the kernel for free VTs ++AC_CHECK_HEADERS(sys/vt.h) ++AC_CHECK_HEADERS(sys/ioctl.h) ++ + dnl checks needed for Darwin compatibility to linux **environ. + AC_CHECK_HEADERS(crt_externs.h) + AC_CHECK_FUNCS(_NSGetEnviron) +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index da18835..c1b6bda 100644 +--- a/daemon/Makefile.am ++++ b/daemon/Makefile.am +@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DLOGDIR=\"$(logdir)\" \ + -DSBINDIR=\"$(sbindir)\" \ ++ -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ + -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ +diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c +index 339f3cc..29d16dc 100644 +--- a/daemon/gdm-server.c ++++ b/daemon/gdm-server.c +@@ -26,6 +26,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -42,6 +44,7 @@ + #include + #include + #include ++#include + + #include /* for Display */ + +@@ -54,6 +57,8 @@ extern char **environ; + + #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate)) + ++#define INITTAB SYSCONFDIR"/inittab" ++ + /* These are the servstat values, also used as server + * process exit codes */ + #define SERVER_TIMEOUT 2 /* Server didn't start */ +@@ -674,6 +679,105 @@ gdm_server_spawn (GdmServer *server, + } + + /** ++ * Parse the inittab file used by getty to spawn VTs to find unused ttys ++ */ ++int ++get_free_vt_from_inittab () ++{ ++ GFile *gfile; ++ GFileInputStream *contents; ++ GDataInputStream *dstream; ++ GRegex *getty; ++ GMatchInfo *tty_match = NULL; ++ GSList *tty_list = NULL; ++ GError *error = NULL; ++ gchar *temp = NULL; ++ int vtno = 0; ++ ++ gfile = g_file_new_for_path (INITTAB); ++ contents = g_file_read (gfile, NULL, &error); ++ g_object_unref (gfile); ++ if (!contents) { ++ if (error) { ++ g_debug ("Unable to open file %s", INITTAB); ++ g_error_free (error); ++ } ++ goto out; ++ } ++ ++ dstream = g_data_input_stream_new (G_INPUT_STREAM (contents)); ++ getty = g_regex_new ("^c[0-9]+:.+getty.+tty([0-9]+)", 0, 0, NULL); ++ g_object_unref (contents); ++ ++ while (1) { ++ temp = g_data_input_stream_read_line (dstream, NULL, NULL, &error); ++ if (!temp) ++ break; ++ if (!g_regex_match (getty, temp, 0, &tty_match)) ++ continue; ++ g_free (temp); ++ temp = g_match_info_fetch (tty_match, 1); ++ if (!temp) ++ continue; ++ tty_list = g_slist_insert_sorted (tty_list, temp, (GCompareFunc)g_strcmp0); ++ g_match_info_free (tty_match); ++ } ++ ++ if (error) { ++ g_debug ("Unable to read line from %s", INITTAB); ++ g_error_free (error); ++ goto free; ++ } ++ ++ /* Ignore holes in vt allocation, just take the last one */ ++ temp = g_slist_last (tty_list)->data; ++ if (temp) ++ vtno = (int) g_ascii_strtoull (temp, NULL, 10) + 1; ++ ++free: ++ g_object_unref (dstream); ++ g_regex_unref (getty); ++ g_slist_free_full (tty_list, g_free); ++ g_free (error); ++out: ++ return vtno; ++} ++ ++/** ++ * Query the VT_* kernel ioctls to find an empty tty ++ */ ++int ++get_free_vt_from_kernel() ++{ ++ int fd, vtno = 0; ++ ++ fd = open ("/dev/tty0", O_WRONLY, 0); ++ if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { ++ vtno = 0; ++ g_debug ("Unable to find a free vt, falling back to Xorg autodetect"); ++ } ++ return vtno; ++} ++ ++gchar* ++get_free_vt () ++{ ++ int inittab_vtno, kernel_vtno; ++ gchar* vt = NULL; ++ ++ inittab_vtno = get_free_vt_from_inittab(); ++ if (inittab_vtno > 0) ++ g_debug ("Inittab says vt%i is free\n", inittab_vtno); ++ kernel_vtno = get_free_vt_from_kernel(); ++ if (kernel_vtno > 0) ++ g_debug ("Kernel says vt%i is free\n", kernel_vtno); ++ /* Select the greater of the two because getty will use the others */ ++ if (kernel_vtno != 0 && inittab_vtno != 0) ++ vt = g_strdup_printf ("vt%i", kernel_vtno > inittab_vtno ? kernel_vtno : inittab_vtno); ++ return vt; ++} ++ ++/** + * gdm_server_start: + * @disp: Pointer to a GdmDisplay structure + * +@@ -686,7 +790,7 @@ gdm_server_start (GdmServer *server) + gboolean res; + + /* fork X server process */ +- res = gdm_server_spawn (server, NULL); ++ res = gdm_server_spawn (server, get_free_vt()); + + return res; + } +-- +1.7.3.4 + diff --git a/gnome-base/gdm/gdm-2.32.0.ebuild b/gnome-base/gdm/gdm-2.32.0.ebuild deleted file mode 100644 index 294d4d4fdb04..000000000000 --- a/gnome-base/gdm/gdm-2.32.0.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.32.0.ebuild,v 1.2 2010/11/11 11:48:55 ssuominen Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit autotools eutils gnome2 pam - -DESCRIPTION="GNOME Display Manager" -HOMEPAGE="http://www.gnome.org/projects/gdm/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86" - -IUSE_LIBC="elibc_glibc" -IUSE="accessibility +consolekit ipv6 gnome-keyring selinux tcpd test xinerama +xklavier $IUSE_LIBC" - -# Name of the tarball with gentoo specific files -GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1" - -SRC_URI="${SRC_URI} - mirror://gentoo/${GDM_EXTRA}.tar.bz2" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -RDEPEND=" - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.22:2 - >=x11-libs/gtk+-2.20.2:2 - >=x11-libs/pango-1.3 - >=media-libs/libcanberra-0.4[gtk] - >=gnome-base/gconf-2.31.3 - >=gnome-base/gnome-panel-2 - >=gnome-base/gnome-session-2.28 - >=x11-misc/xdg-utils-1.0.2-r3 - >=sys-power/upower-0.9 - app-text/iso-codes - - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-apps/sessreg - - virtual/pam - consolekit? ( sys-auth/consolekit ) - - accessibility? ( x11-libs/libXevie ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) - xklavier? ( >=x11-libs/libxklavier-4 ) - - !gnome-extra/fast-user-switch-applet" -DEPEND="${RDEPEND} - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code - G2CONF="${G2CONF} - --disable-schemas-install - --localstatedir=/var - --with-xdmcp=yes - --enable-authentication-scheme=pam - --with-pam-prefix=/etc - SOUND_PROGRAM=/usr/bin/gdmplay - $(use_with accessibility xevie) - $(use_enable ipv6) - $(use_enable xklavier libxklavier) - $(use_with consolekit console-kit) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - enewgroup gdm - enewuser gdm -1 -1 /var/lib/gdm gdm -} - -src_prepare() { - gnome2_src_prepare - - # remove unneeded linker directive for selinux, bug #41022 - epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch" - - # daemonize so that the boot process can continue, bug #236701 - epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch" - - # fix VT grab problem causing GDM to grab VT2 instead of 7, bug #261339 - epatch "${FILESDIR}/${PN}-2.32.0-broken-VT-detection.patch" - - # make custom session work, bug #216984 - epatch "${FILESDIR}/${PN}-2.32.0-custom-session.patch" - - # ssh-agent handling must be done at xinitrc.d, bug #220603 - epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # fix libxklavier automagic support - epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch" - - mkdir "${S}"/m4 - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # gdm-binary should be gdm to work with our init (#5598) - rm -f "${D}/usr/sbin/gdm" - dosym /usr/sbin/gdm-binary /usr/sbin/gdm - - # our x11's scripts point to /usr/bin/gdm - dosym /usr/sbin/gdm-binary /usr/bin/gdm - - # log, etc. - keepdir /var/log/gdm - keepdir /var/gdm - - fowners root:gdm /var/gdm - fperms 1770 /var/gdm - - # add a custom xsession .desktop by default (#44537) - exeinto /etc/X11/dm/Sessions - doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed" - - # add xinitrc.d scripts - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" - doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm || die "doenvd failed" - - # add a custom sound playing script (#248253) - dobin "${gentoodir}/gdmplay" - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - dopamd "${gentoodir}"/pam.d/* - dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" -} - -pkg_postinst() { - gnome2_pkg_postinst - - ewarn - ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" - ewarn "visit us on #gentoo-desktop if you have problems." - ewarn - - elog "To make GDM start at boot, edit /etc/conf.d/xdm" - elog "and then execute 'rc-update add xdm default'." - elog "If you already have GDM running, you will need to restart it." - - if use gnome-keyring; then - elog "For autologin to unlock your keyring, you need to set an empty" - elog "password on your keyring. Use app-crypt/seahorse for that." - fi - - if [ -f "/etc/X11/gdm/gdm.conf" ]; then - elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" - elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" - mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if rc-config list default | grep -q xdm; then - elog "To remove GDM from startup please execute" - elog "'rc-update del xdm default'" - fi -} diff --git a/gnome-base/gdm/gdm-2.32.1-r1.ebuild b/gnome-base/gdm/gdm-2.32.1-r1.ebuild new file mode 100644 index 000000000000..8c0efcf273ca --- /dev/null +++ b/gnome-base/gdm/gdm-2.32.1-r1.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.32.1-r1.ebuild,v 1.1 2011/05/03 06:46:10 nirbheek Exp $ + +EAPI="3" +GCONF_DEBUG="yes" + +inherit autotools eutils gnome2 pam + +DESCRIPTION="GNOME Display Manager" +HOMEPAGE="http://www.gnome.org/projects/gdm/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86" + +IUSE_LIBC="elibc_glibc" +IUSE="accessibility +consolekit ipv6 gnome-keyring selinux tcpd test xinerama +xklavier $IUSE_LIBC" + +# Name of the tarball with gentoo specific files +GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1" + +SRC_URI="${SRC_URI} + mirror://gentoo/${GDM_EXTRA}.tar.bz2" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +RDEPEND=" + >=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.22:2 + >=x11-libs/gtk+-2.20.2:2 + >=x11-libs/pango-1.3 + >=media-libs/libcanberra-0.4[gtk] + >=gnome-base/gconf-2.31.3 + >=gnome-base/gnome-panel-2 + >=gnome-base/gnome-session-2.28 + >=x11-misc/xdg-utils-1.0.2-r3 + >=sys-power/upower-0.9 + app-text/iso-codes + + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-apps/sessreg + + virtual/pam + consolekit? ( sys-auth/consolekit ) + + accessibility? ( x11-libs/libXevie ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) + xklavier? ( >=x11-libs/libxklavier-4 ) + + !gnome-extra/fast-user-switch-applet" +DEPEND="${RDEPEND} + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) + app-text/docbook-xml-dtd:4.1.2 + sys-devel/gettext + x11-proto/inputproto + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + >=app-text/scrollkeeper-0.1.4 + >=app-text/gnome-doc-utils-0.3.2" + +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS README TODO" + + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code + G2CONF="${G2CONF} + --disable-schemas-install + --localstatedir=/var + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-pam-prefix=/etc + SOUND_PROGRAM=/usr/bin/gdmplay + $(use_with accessibility xevie) + $(use_enable ipv6) + $(use_enable xklavier libxklavier) + $(use_with consolekit console-kit) + $(use_with selinux) + $(use_with tcpd tcp-wrappers) + $(use_with xinerama)" + + enewgroup gdm + enewuser gdm -1 -1 /var/lib/gdm gdm +} + +src_prepare() { + gnome2_src_prepare + + # remove unneeded linker directive for selinux, bug #41022 + epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch" + + # daemonize so that the boot process can continue, bug #236701 + epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch" + + # GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852 + epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch" + + # make custom session work, bug #216984 + epatch "${FILESDIR}/${PN}-2.32.0-custom-session.patch" + + # ssh-agent handling must be done at xinitrc.d, bug #220603 + epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # fix libxklavier automagic support + epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch" + + mkdir "${S}"/m4 + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + +src_install() { + gnome2_src_install + + local gentoodir="${WORKDIR}/${GDM_EXTRA}" + + # gdm-binary should be gdm to work with our init (#5598) + rm -f "${D}/usr/sbin/gdm" + dosym /usr/sbin/gdm-binary /usr/sbin/gdm + + # our x11's scripts point to /usr/bin/gdm + dosym /usr/sbin/gdm-binary /usr/bin/gdm + + # log, etc. + keepdir /var/log/gdm + keepdir /var/gdm + + fowners root:gdm /var/gdm + fperms 1770 /var/gdm + + # add a custom xsession .desktop by default (#44537) + exeinto /etc/X11/dm/Sessions + doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed" + + # add xinitrc.d scripts + exeinto /etc/X11/xinit/xinitrc.d + doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" + doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm || die "doenvd failed" + + # add a custom sound playing script (#248253) + dobin "${gentoodir}/gdmplay" + + # avoid file collision, bug #213118 + rm -f "${D}/usr/share/xsessions/gnome.desktop" + + # We replace the pam stuff by our own + rm -rf "${D}/etc/pam.d" + + use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* + + dopamd "${gentoodir}"/pam.d/* + dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" +} + +pkg_postinst() { + gnome2_pkg_postinst + + ewarn + ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" + ewarn "visit us on #gentoo-desktop if you have problems." + ewarn + + elog "To make GDM start at boot, edit /etc/conf.d/xdm" + elog "and then execute 'rc-update add xdm default'." + elog "If you already have GDM running, you will need to restart it." + + if use gnome-keyring; then + elog "For autologin to unlock your keyring, you need to set an empty" + elog "password on your keyring. Use app-crypt/seahorse for that." + fi + + if [ -f "/etc/X11/gdm/gdm.conf" ]; then + elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" + elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" + mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if rc-config list default | grep -q xdm; then + elog "To remove GDM from startup please execute" + elog "'rc-update del xdm default'" + fi +} -- cgit v1.2.3-65-gdbad