Merge lp:~xnox/utah/fix-chroot into lp:utah

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Javier Collado
Approved revision: 771
Merged at revision: 780
Proposed branch: lp:~xnox/utah/fix-chroot
Merge into: lp:utah
Diff against target: 15 lines (+2/-3)
1 file modified
utah/provisioning/provisioning.py (+2/-3)
To merge this branch: bzr merge lp:~xnox/utah/fix-chroot
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+138522@code.launchpad.net

Description of the change

This should hopefully fix bug 1061242 .
Instead of using manual chroot use the supported wrapper that does a log of checks and correctly enters /target in a way that will allow package installation. In particular it bind-mounts /run for DNS resolution.

This backs out the previous "fix" which overrode /etc/resolv.conf symlink pointing into /run.

I have tried to run the desktop smoke run_list locally, but I did not succeed in setting up utah to execute the test correctly for me.

Please test this about raring desktop smoke test, or review for sanity & merge and re-trigger jenkins to run to see if it finally resolves the desktop smoke jobs.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

I'm testing this on my workstation on VMs, and I'm preparing to test it on bare metal. I'll update this with the results.

Revision history for this message
Max Brustkern (nuclearbob) wrote :

This has tested okay on conventional hardware. Unless anyone else on the team objects, I'd like to merge it.

review: Approve
Revision history for this message
Javier Collado (javier.collado) wrote :

Merging as per comment above.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/provisioning/provisioning.py'
2--- utah/provisioning/provisioning.py 2012-12-06 15:19:55 +0000
3+++ utah/provisioning/provisioning.py 2012-12-06 17:50:31 +0000
4@@ -1043,9 +1043,8 @@
5 .format(install_commands)
6 )
7 chroot_command = ' '.join([install_commands, postinstall_commands])
8- question.value.prepend('cp /etc/resolv.conf '
9- '/target/etc/resolv.conf ; chroot /target sh -c \'{}\'; '
10- .format(chroot_command))
11+ question.value.prepend('in-target sh -c \'{}\'; '
12+ .format(chroot_command))
13 question.prepend("ubiquity ubiquity/summary note")
14 question.prepend("ubiquity ubiquity/reboot boolean true")
15 else:

Subscribers

People subscribed via source and target branches