Merge lp:~fossfreedom/ubiquity/use_gsd_for_budgie into lp:ubiquity

[fossfreedom]

as per bug-report https://bugs.launchpad.net/ubuntu/+source/ubiquity/+bug/1663058 description

[Adam Conrad (adconrad)]

If you have both usd and gsd installed, that's a bug, not a feature. Ubiquity shouldn't be working around it.

review: Disapprove

[Jeremy Bícha (jbicha)]

According to the manifest, Ubuntu Budgie shouldn't have unity-settings-daemon installed:

http://cdimage.ubuntu.com/ubuntu-budgie/daily-live/current/zesty-desktop-amd64.manifest

[lp:~fossfreedom/ubiquity/use_gsd_for_budgie]

6523. By fossfreedom on 2017-02-09

remove the unnecessary forced install of gsd

[fossfreedom (fossfreedom)]

> If you have both usd and gsd installed, that's a bug, not a feature. Ubiquity
> shouldn't be working around it.

@adconrad - you know working on alpha-beta's are fun!

Nothing what Ubuntu Budgie has done I swear - unity-settings-daemon has now disappeared from our ISO.

That's excellent!

I've removed the offending code and hopefully the if statement should now fall through and load gsd.

review: Needs Resubmitting

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good like this; now that we've verified the state of a settings daemon in the image.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2017-02-06 15:54:03 +0000
+++ bin/ubiquity-dm	2017-02-09 07:59:32 +0000
@@ -522,11 +522,6 @@
                         [msd], stdin=null, stdout=logfile, stderr=logfile,
                         preexec_fn=self.drop_privileges))
 
-                elif osextras.find_on_path('budgie-wm'):
-                    # Ubuntu Budgie does not need a settings daemon for
-                    # ubiquity-dm
-                    pass
-
                 elif (osextras.find_on_path(usd)):
                     # Wait until xsettings plugin is activated
                     xsettings = SignalWatcher(self, usd,