ubiquity

Merge lp:~jibel/ubiquity/lp1719734-oem-prepare-wayland into lp:ubiquity

  1. lp1719734-oem-prepare-wayland
  2. Merge into trunk
Proposed by Jean-Baptiste Lallement
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 6564
Merged at revision: 6568
Proposed branch: lp:~jibel/ubiquity/lp1719734-oem-prepare-wayland
Merge into: lp:ubiquity
Diff against target: 14 lines (+3/-1)
1 file modified
bin/oem-config-prepare (+3/-1)
To merge this branch: bzr merge lp:~jibel/ubiquity/lp1719734-oem-prepare-wayland
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+331385@code.launchpad.net

Description of the change

Under wayland, the confirmation dialog of oem prepare is not displayed because oem-config-prepare is pkexec-ed as root.
This fix drop privileges to the oem user so zenity can be executed and display the dialog.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Yes please.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/oem-config-prepare'
2--- bin/oem-config-prepare 2016-03-30 05:29:29 +0000
3+++ bin/oem-config-prepare 2017-09-26 21:34:08 +0000
4@@ -43,7 +43,9 @@
5 case $frontend in
6 gtk_ui)
7 if [ "$DISPLAY" ] && type zenity >/dev/null 2>&1; then
8- zenity --title oem-config-prepare --info --text \
9+ # Drop privileges to the oem user so the dialog is not blocked
10+ # by wayland
11+ sudo -u oem zenity --title oem-config-prepare --info --text \
12 "$MESSAGE"
13 exit 0
14 fi

Subscribers

People subscribed via source and target branches

to status/vote changes: