Rename /etc/X11/Xsession.d/60x11-localhost to match convention

Assigning to Bryce as requested on IRC.

I think this bug prevents me to log in.

I get an error-message that means that my session lasted less than 10 seconds and that there may be an installation-error.

Unter details I get the following message:

/etx/gdm/Xsession: Beginning session setup...
/etx/X11/Xsession.d/60x11-localhost: 4: Syntax error: Bad fd number

Alex:
No, that is unrelated to the name of the file, and is already fixed in 7.4~5ubuntu15.

Since the file is under /etc, renaming it is not as trivial as just moving the file.
However I'm not certain what postrm magic is needed exactly... here's a first draft of a patch to do it.

use remove_conffile_commit as used in x11-common.postinst.in (sorry, was wrong when suggested postrm.in), add a new rule after the current one with correct versions. Something like this:

if dpkg --compare-versions "$2" lt-nl "1:7.4~5ubuntu16"; then
  remove_conffile_commit "/etc/X11/Xsession.d/60x11-localhost"
fi

Thanks Timo, how's this look?

better, but I think it's best to put it inside the 'case "$1" in configure)' rule, at least it's commonly used in cases like this.

How's this then?

yeah, it should be good to go.

After installing the xorg package with this change, it does not seem to remove the script properly:

root@dorset:/etc/X11/Xsession.d# ls
20x11-common_process-args 55gnome-session_gnomerc 65mesa-check-x86-64 90x11-common_ssh-agent
30x11-common_xresources 60seahorse-plugins 70pulseaudio 99x11-common_start
40x11-common_xsessionrc 60x11-common_localhost 75dbus_dbus-launch
50x11-common_determine-startup 60x11-localhost 80im-switch
52libcanberra-gtk-module_add-to-gtk-modules 60xdg-user-dirs-update 90consolekit

Ideas?

This bug was fixed in the package xorg - 1:7.4~5ubuntu16

---------------
xorg (1:7.4~5ubuntu16) jaunty; urgency=low

  [Tormod Volden]
  * apport/source_xorg.py: Use grep directly instead of shelling out, and
    look in /proc/modules as well. Also only set 'fglrx-installed' if
    there was a definite match.

  [Bryce Harrington]
  * x11-common.links: Add apport support for a several more packages.
  * local/Xsession.d/60x11-common_localhost:
    - Rename from 60x11-localhost for consistency (LP: #340807)
    - Redirect stderr in an sh-safe fashion
  * x11-common.postinst.in, x11-common.preinst.in, x11-common.postrm.in:
    - Remove renamed 60x11-localhost; handle upgrade failures gracefully
  * local/dexconf, local/Failsafe/failsafeDexconf:
    - Add hooks for Sun's virtualbox (LP: #319373)
  * local/Failsafe/failsafeXinit:
    - Use zenity for viewing logs, and vt2 for console login
      (LP: #310126)
    - Make translatable (LP: #335678)
  * apport/source_xorg.py: Suppress warning about keyboard geometry on :0
    (LP: #315777)

 -- Bryce Harrington <email address hidden> Wed, 18 Mar 2009 13:54:27 -0700

This regressed. When the file was renamed it didn't get added to git for some reason, then later I noticed the file was not in git and did not remember why it was where it was, so assumed it was a stray file and dropped it. Actually it is not stray and should be restored, else this bug will be regressed for users.

It appears since the file was present up until the last xorg upload, users who upgrade will still have the file, but fresh installs of karmic will find it missing, and may have problems running xhost and so on.

This restores the missing file

Actually on second thought, it is bug 276357 which regresses rather than this one, just to be correct...

Here is the file in question, in case anyone needs it to work around the problem while this SRU goes through the process. Copy this to /etc/X11/Xsession.d/

Reopening while the SRU goes through, then.

Accepted into karmic-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

Setting karmic task to fix committed while it is only in -proposed.

I reject the duplicate xorg upload.

This bug was fixed in the package xorg - 1:7.4+3ubuntu9

---------------
xorg (1:7.4+3ubuntu9) karmic-proposed; urgency=low

  * Restore 60x11-common_localhost. I dropped this before because the
    file was not in git so assumed it was stray. On further review I
    see this was intentionally added, just not to git, and was not stray.
    (LP: #340807)
  * control: Add Vcs-git tags

 -- Bryce Harrington <email address hidden> Wed, 04 Nov 2009 18:54:26 -0800

copied karmic-proposed to lucid.

Can anyone confirm that this bug is fixed with the new upload?

.

trabajando en eso

trabajando...

en eso,.

This bug was fixed in the package xorg - 1:7.4+3ubuntu10

xorg (1:7.4+3ubuntu10) karmic-proposed; urgency=low

  * local/Failsafe/failsafeXServer: Since dexconf no longer produces
    an xorg.conf, it will neither generate a failsafe xorg.conf, so now
    we just generate one directly. Otherwise X won't start a failsafe
    session properly.
    (LP: #477149)
 -- Bryce Harrington <email address hidden> Mon, 09 Nov 2009 15:39:57 -0800

xorg (1:7.4+3ubuntu9) karmic-proposed; urgency=low

  * Restore 60x11-common_localhost. I dropped this before because the
    file was not in git so assumed it was stray. On further review I
    see this was intentionally added, just not to git, and was not stray.
    (LP: #340807)
  * control: Add Vcs-git tags
 -- Bryce Harrington <email address hidden> Wed, 04 Nov 2009 18:54:26 -0800

xorg (1:7.4+3ubuntu8) karmic-proposed; urgency=low

  * debian/local/Failsafe/failsafe{XServer,Xinit},
    debian/x11-common.failsafe-x.upstart: convert Bulletproof-X support over
    to upstart, for compatibility with gdm in karmic. LP: #474806.
  * debian/rules: install the new upstart job with dh_installinit.
  * debian/control: bump the debhelper versioned build-dependency for the
    same
 -- Steve Langasek <email address hidden> Wed, 04 Nov 2009 18:00:49 -0800

This bug was fixed in the package xorg - 1:7.5+1ubuntu1

---------------
xorg (1:7.5+1ubuntu1) lucid; urgency=low

  * Merge from Debian unstable.

xorg (1:7.5+1) unstable; urgency=low

  * Drop xorg-dev dependency on x11proto-xf86misc-dev and libxxf86misc-dev,
    which are obsolete.
  * Same with x11proto-trap-dev and libxtrap-dev.
  * The call to udevadm trigger has moved to xserver-xorg-core and the
    drivers, remove it from xserver-xorg.postinst.
  * Upload to unstable.

xorg (1:7.5~3ubuntu4) lucid; urgency=low

  * debian/x11-common.failsafe-x.upstart:
    - Revert the changes from the last upload since it's been decided that
      there won't be a DKMS upstart task.

xorg (1:7.5~3ubuntu3) lucid; urgency=low

  * debian/x11-common.failsafe-x.upstart: (LP: #453365)
    - Start on the build-failed signal that DKMS may emit
      during a failed build for nvidia or fglrx.

xorg (1:7.5~3ubuntu2) lucid; urgency=low

  * scripts/vars.*: Drop wacom from input-all until it builds again.

xorg (1:7.5~3ubuntu1) lucid; urgency=low

  * Merge from Debian experimental. Remaining changes:
    - apport/source_xorg.py, x11-common.install, x11-common.links:
      + apport hook for xorg-server crashes
    - control:
      + Add xqbiff (<= 0.75-4) to x11-common Conflicts (LP 217724).
      + Add xinput to xorg Depends so it will stay in main
      + Move xfonts-scalable to Recommends (LP 84938)
    - rules, control:
      + Add a dependency to x11-common for each binary built to save
        disk/livecd space.
      + Symlink the doc directories to x11-common, explicitly remove the
        doc directories on upgrade for the now symlinked doc directories
    - local/Failsafe/*, x11-common.install, x11-common.failsafe-x.upstart,
      rules: Bulletproof-X.
    - local/Xsession:
      + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last
        0.5MiB to avoid having it grow indefinitively. (This does not happen
        with gdm anyway since gdm cleans the file on login).
    - local/Xsession.d/60x11-common_localhost: Allow X connections from
      local unix domain sockets instead of forcing TCP since hostname
      validation is not necessary in this case. (LP 276357)
    - local/dexconf:
      + Add extra bits for ps3fb xorg.conf.
      + dexconf: Bring Device back to the Screen-section, nvidia-settings
        and aticonfig need that.
      + Add customizations to detect if running in KVM/VBOX environment
        and specify the driver, H/V rates, DefaultDepth, etc.
    - local/xserver-wrapper.c: Stop handling -config specifically in the
      wrapper, as Xorg now handles this itself.
    - scripts/vars.*: Don't include radeonhd in video-all.
    - scripts/vars.i386: Add geode to video-all.
    - scripts/vars.{i386,amd64}: Add vmmouse (LP 407816).
    - x11-common.postinst.in, postrm.in, preinst.in: Remove old configuration
      files.
    - xserver-xorg.postinst.in: Migrate psb users to vesa.
  * control: Drop Breaks on gdm, since it was only needed during karmic.
    Likewise for Conflicts/Replaces hal.
  * control, local/debian-setup-keyboard: Use console-setup, until the
    new version is merged.

xorg (1:7.5~3) experimental; ur...