Merge lp:~agateau/lightdm/move-to-sbin into lp:lightdm

[Aurélien Gâteau]

Install lightdm-set-defaults and lightdm-guest-session-wrapper in $prefix/sbin

This makes it easier to call lightdm-set-defaults from admin scripts because one does not have to worry about its installation path, which is not always the same when multiarch packaging is involved (it will be in /usr/lib/x86_64-linux-gnu/lightdm on amd64 systems), making it difficult to call it from postinsts of other packages.

Moving lightdm-guest-session-wrapper to $prefix/sbin is also useful to avoid putting it in $PATH for all users. It was in $PATH previously because it is in the same dir as gdmflexiserver.

The alternative would be to force libexecdir to /usr/lib on the packaging side, I can provide a MR for the packaging branch if you prefer to keep lightdm code as is.

[Robert Ancell (robert-ancell)]

The lightdm-set-defaults change is fine, not sure what packages need updating to use the new location though. Perhaps a symlink is needed in the packaging for migration?

I'm unsure about the other changes as I'm not 100% what they do and haven't have the time to review.

[Aurélien Gâteau (agateau)]

Indeed, either a symlink or a shell script (which could print out a deprecation warning) would be needed.

Regarding the lightdm-guest-session-wrapper move: this is not related. Right now lightdm-guest-session-wrapper and gdmflexiserver are both installed in /usr/lib/lightdm/lightdm/. /usr/lib/lightdm/lightdm is prepended to $PATH so that user programs can find LightDM implementation of gdmflexiserver. This means lightdm-guest-session-wrapper is added to $PATH as well. Installing it in /usr/sbin prevents that.

I can rework the MR to only change the installation dir of lightdm-set-defaults if you prefer.

[Robert Ancell (robert-ancell)]

Yes, two MPs would be good, thanks.

Ah I understand now. lightdm-guest-session-wrapper should not be user accessible, so it is in the correct place. The bug here is that /usr/lib/lightdm/lightdm/ is in the path. gdmflexiserver is a sticking plaster until apps stop using this program. So I think the correct solution here is to move it from $(pkglibexecdir) to $(pkglibexecdir)/gdmflexiserver or $(pkglibexecdir)/legacy or similar.

[Robert Ancell (robert-ancell)]

review: Needs Fixing

[Robert Ancell (robert-ancell)]

Closing due to inactivity. Please reopen if still applicable!

Unmerged revisions

1363. By Aurélien Gâteau on 2012-01-18

Install lightdm-set-defaults and lightdm-guest-session-wrapper in $prefix/sbin

This makes it easier to call lightdm-set-defaults from admin scripts because
one does not have to worry about its path. It is especially important when
multiarch packaging is involved because in this case $(libexecdir) or
$(pkglibexecdir) are architecture-dependents, making it difficult to call any
binary there from another package.

Moving lightdm-guest-session-wrapper to $prefix/sbin is also useful to avoid
putting it in $PATH for all users. It was in $PATH previously because it is in
the same dir as gdmflexiserver.

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-09-30 12:19:30 +0000
+++ data/Makefile.am	2012-01-18 21:22:24 +0000
@@ -12,7 +12,7 @@
 
 install-data-hook:
 	install -d $(DESTDIR)$(apparmor_profiledir)
-	sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \
+	sed 's!SBINDIR!$(sbindir)!g' < $(srcdir)/guest-session.apparmor \
 		> $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session
 
 dist_man1_MANS = lightdm.1

=== modified file 'data/guest-session.apparmor'
--- data/guest-session.apparmor	2011-11-01 18:59:19 +0000
+++ data/guest-session.apparmor	2012-01-18 21:22:24 +0000
@@ -4,7 +4,7 @@
 
 #include <tunables/global>
 
-LIBEXECDIR/lightdm-guest-session-wrapper {
+SBINDIR/lightdm-guest-session-wrapper {
   #include <abstractions/authentication>
   #include <abstractions/nameservice>
   #include <abstractions/wutmp>

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-01-17 05:34:22 +0000
+++ src/Makefile.am	2012-01-18 21:22:24 +0000
@@ -92,7 +92,7 @@
 	$(LIGHTDM_LIBS) \
 	-lpam
 
-pkglibexec_PROGRAMS = lightdm-guest-session-wrapper
+sbin_PROGRAMS += lightdm-guest-session-wrapper
 
 lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c
 

=== modified file 'src/display.c'
--- src/display.c	2012-01-17 05:34:22 +0000
+++ src/display.c	2012-01-18 21:22:24 +0000
@@ -467,7 +467,7 @@
     if (display->priv->autologin_guest)
     {
         gchar *t = command;
-        command = g_strdup_printf (PKGLIBEXEC_DIR "/lightdm-guest-session-wrapper %s", command);
+        command = g_strdup_printf (SBIN_DIR "/lightdm-guest-session-wrapper %s", command);
         g_debug("Guest session, running session command through wrapper: %s", command);
         g_free (t);
     }

=== modified file 'utils/Makefile.am'
--- utils/Makefile.am	2012-01-12 10:20:17 +0000
+++ utils/Makefile.am	2012-01-18 21:22:24 +0000
@@ -1,5 +1,5 @@
 bin_PROGRAMS = dm-tool
-pkglibexec_PROGRAMS = lightdm-set-defaults
+sbin_PROGRAMS = lightdm-set-defaults
 legacydir = $(libexecdir)/lightdm
 dist_legacy_SCRIPTS = gdmflexiserver