[26973] in Source-Commits
Re: /svn/athena r25858 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Mar 22 12:31:54 2013
Date: Fri, 22 Mar 2013 12:31:44 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201303211636.r2LGaAWC029480@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1303221231410.9389@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Thu, 21 Mar 2013, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2013-03-21 12:36:10 -0400 (Thu, 21 Mar 2013)
> New Revision: 25858
>
> Modified:
> trunk/debathena/config/lightdm-config/debian/changelog
> trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst
> Log:
> In lightdm-config:
> * Be robust against the fact that you're not supposed to use symlinks in
> Upstart jobs.
>
>
> Modified: trunk/debathena/config/lightdm-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/changelog 2013-03-20 20:11:51 UTC (rev 25857)
> +++ trunk/debathena/config/lightdm-config/debian/changelog 2013-03-21 16:36:10 UTC (rev 25858)
> @@ -1,3 +1,10 @@
> +debathena-lightdm-config (1.11) UNRELEASED; urgency=low
> +
> + * Be robust against the fact that you're not supposed to use symlinks in
> + Upstart jobs.
> +
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 21 Mar 2013 12:35:54 -0400
> +
> debathena-lightdm-config (1.10) unstable; urgency=low
>
> * Convert from CDBS to dh7 by moving diversion to .displace file, and
>
> Modified: trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst
> ===================================================================
> --- trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst 2013-03-20 20:11:51 UTC (rev 25857)
> +++ trunk/debathena/config/lightdm-config/debian/debathena-lightdm-config.postinst 2013-03-21 16:36:10 UTC (rev 25858)
> @@ -20,6 +20,14 @@
> # Source debconf library.
> . /usr/share/debconf/confmodule
>
> +# This tag needs to be here because we need to run _after_ c-p-d has
> +# done its diversions. "Because Upstart"
> +# dh_installdeb will replace this with shell code automatically
> +# generated by other debhelper scripts.
> +
> +#DEBHELPER#
> +
> +
> case "$1" in
> configure)
> db_get debathena-lightdm-config/force_lightdm
> @@ -27,6 +35,15 @@
> db_set shared/default-x-display-manager "lightdm"
> echo "/usr/sbin/lightdm" > /etc/X11/default-display-manager
> fi
> +
> + # Deal with the fact that symlinks don't work in /etc/init
> + # If we managed to confuse upstart such that we don't exist,
> + # force a reload:
> + if ! status lightdm >/dev/null 2>&1; then
> + # I hope this doesn't break the world.
> + initctl reload-configuration
> + fi
> +
> ;;
>
> abort-upgrade|abort-remove|abort-deconfigure)
> @@ -38,9 +55,4 @@
> ;;
> esac
>
> -# dh_installdeb will replace this with shell code automatically
> -# generated by other debhelper scripts.
> -
> -#DEBHELPER#
> -
> exit 0
>
>
