Merge ~jawn-smith/ubuntu/+source/livecd-rootfs:oem-user-check into ubuntu/+source/livecd-rootfs:ubuntu/devel

Proposed by William Wilson
Status: Needs review
Proposed branch: ~jawn-smith/ubuntu/+source/livecd-rootfs:oem-user-check
Merge into: ubuntu/+source/livecd-rootfs:ubuntu/devel
Diff against target: 36 lines (+12/-5)
2 files modified
debian/changelog (+6/-0)
live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot (+6/-5)
Reviewer Review Type Date Requested Status
Łukasz Zemczak (community) Approve
Dave Jones (community) Approve
git-ubuntu import Pending
Review via email: mp+439740@code.qastaging.launchpad.net

Description of the change

We are making efforts to move some of the livecd-rootfs hook logic to packages such as ubuntu-settings. I have staged a change to ubuntu-settings to set up the oem-config user as a postinst for ubuntu-raspi-settings-desktop. I want to avoid an issue where both livecd-rootfs and ubuntu-raspi-settings desktop both try to do this setup, so have added some logic here to only run the oem-config setup steps if the oem user does not already exist.

To post a comment you must log in.
Revision history for this message
Dave Jones (waveform) wrote :

Looks reasonable to me in the context of the proposed ubuntu-raspi-settings-desktop changes [1]. We *could* remove the lines under the assumption that the postinst will take care of them but that potentially breaks other pre-installed desktop images (I'm not sure there are any official ones yet, but there might be so this is the safer option).

Also, better to stick hacks like this in the pile-of-hacks-known-as-livecd-rootfs than anywhere else under the assumption that many of them will disappear in a puff of ubuntu-image-flavoured-smoke in the coming cycle.

[1]: https://dpaste.com/CX2JGNYGK

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looking good!

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Actually, wrong MP target! We have a dedicated livecd-rootfs repo: https://code.launchpad.net/livecd-rootfs

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches