Merge lp:~fourdollars/ubiquity/trunk into lp:ubiquity

Proposed by Shih-Yuan Lee
Status: Merged
Merged at revision: 6240
Proposed branch: lp:~fourdollars/ubiquity/trunk
Merge into: lp:ubiquity
Diff against target: 42 lines (+5/-3)
2 files modified
bin/ubiquity-dm (+2/-0)
ubiquity/gsettings.py (+3/-3)
To merge this branch: bzr merge lp:~fourdollars/ubiquity/trunk
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Review via email: mp+244695@code.launchpad.net

Description of the change

Fix the usage of effective uid/gid and the HOME environment variable.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve
lp:~fourdollars/ubiquity/trunk updated
6235. By Dimitri John Ledkov

* Add --quiet option to dmidecode calls, in the future release that will
  prevent dmidecode from printing error banner if a newer than dmidecode
  smbios version has happened to be in use. LP: #1353580.
* Add "support" for Gauja laptops and self-builts - that is do not use
  "To be filled by O.E.M." as a valid model name.

6236. By Dimitri John Ledkov

Enable the ubiquity panel in xfwm4 now since it is functional.

6237. By Dimitri John Ledkov

scripts/plugininstall.py: Remove obsolete code to generate wallpaper
cache, unity-settings-daemon/gnome-settings-daemon now run in install
mode (LP: #1318621)

6238. By Dimitri John Ledkov

Improve support for Mate desktop.

6239. By Dimitri John Ledkov

* Remove setting translated placeholder text in the usersetup
  plugin. (LP: #1283047)
* Drop translation messages from ubiquity.templates.

6240. By Dimitri John Ledkov

Fix the usage of effective uid/gid and the HOME environment variable.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubiquity-dm'
2--- bin/ubiquity-dm 2014-07-21 20:40:11 +0000
3+++ bin/ubiquity-dm 2014-12-15 03:16:23 +0000
4@@ -167,7 +167,9 @@
5 def drop_privileges(self):
6 os.setgroups(self.groups)
7 os.setgid(self.gid)
8+ os.setegid(self.gid)
9 os.setuid(self.uid)
10+ os.seteuid(self.uid)
11
12 def server_preexec(self):
13 signal.signal(signal.SIGUSR1, signal.SIG_IGN)
14
15=== modified file 'ubiquity/gsettings.py'
16--- ubiquity/gsettings.py 2013-02-19 11:33:07 +0000
17+++ ubiquity/gsettings.py 2014-12-15 03:16:23 +0000
18@@ -48,7 +48,7 @@
19 user = os.getenv("SUDO_USER", os.getenv("USER", "root"))
20
21 subp = subprocess.Popen(
22- ['sudo', '-u', user, 'gsettings', 'get', schema, key],
23+ ['sudo', '-H', '-u', user, 'gsettings', 'get', schema, key],
24 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
25 preexec_fn=misc.drop_all_privileges, universal_newlines=True)
26 value = subp.communicate()[0].rstrip('\n')
27@@ -103,7 +103,7 @@
28 value = "true" if value else "false"
29
30 subprocess.call(
31- ['sudo', '-u', user, 'gsettings', 'set', schema, key, str(value)],
32+ ['sudo', '-H', '-u', user, 'gsettings', 'set', schema, key, str(value)],
33 preexec_fn=misc.drop_all_privileges)
34
35
36@@ -123,5 +123,5 @@
37 user = os.getenv("SUDO_USER", os.getenv("USER", "root"))
38
39 subprocess.call(
40- ['sudo', '-u', user, 'gsettings', 'reset', schema, key],
41+ ['sudo', '-H', '-u', user, 'gsettings', 'reset', schema, key],
42 preexec_fn=misc.drop_all_privileges)

Subscribers

People subscribed via source and target branches

to status/vote changes: