Merge lp:~pwlars/ubuntu-test-cases/remove-desktop-late_command into lp:ubuntu-test-cases/desktop

Proposed by Paul Larson
Status: Merged
Merged at revision: 40
Proposed branch: lp:~pwlars/ubuntu-test-cases/remove-desktop-late_command
Merge into: lp:ubuntu-test-cases/desktop
Diff against target: 35 lines (+0/-4)
4 files modified
preseeds/default.cfg (+0/-1)
preseeds/default_de.cfg (+0/-1)
preseeds/encrypted_home.cfg (+0/-1)
preseeds/oem.cfg (+0/-1)
To merge this branch: bzr merge lp:~pwlars/ubuntu-test-cases/remove-desktop-late_command
Reviewer Review Type Date Requested Status
Ubuntu Test Case Developers Pending
Review via email: mp+156708@code.launchpad.net

Description of the change

This needs to change, or else the jobs will start failing.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

On Tue, Apr 2, 2013 at 5:27 PM, Paul Larson <email address hidden>wrote:

> Paul Larson has proposed merging
> lp:~pwlars/ubuntu-test-cases/remove-desktop-late_command into
> lp:ubuntu-test-cases/desktop.
>

thanks paul

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'preseeds/default.cfg'
2--- preseeds/default.cfg 2012-08-28 15:55:21 +0000
3+++ preseeds/default.cfg 2013-04-02 22:26:22 +0000
4@@ -35,4 +35,3 @@
5 d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core
6 #need this for non-desktop
7 d-i finish-install/reboot_in_progress note
8-d-i preseed/late_command string chroot /target sh -c 'chmod g+w /var/lib/utah/testsuites; apt-get install -y --force-yes imagemagick'; [ "$?" -eq "0" ]
9
10=== modified file 'preseeds/default_de.cfg'
11--- preseeds/default_de.cfg 2013-01-16 15:23:34 +0000
12+++ preseeds/default_de.cfg 2013-04-02 22:26:22 +0000
13@@ -35,4 +35,3 @@
14 d-i pkgsel/include string openssh-server python-yaml bzr git gdebi-core
15 #need this for non-desktop
16 d-i finish-install/reboot_in_progress note
17-d-i preseed/late_command string chroot /target sh -c 'chmod g+w /var/lib/utah/testsuites; apt-get install -y --force-yes imagemagick'; [ "$?" -eq "0" ]
18
19=== modified file 'preseeds/encrypted_home.cfg'
20--- preseeds/encrypted_home.cfg 2012-08-28 16:14:15 +0000
21+++ preseeds/encrypted_home.cfg 2013-04-02 22:26:22 +0000
22@@ -41,4 +41,3 @@
23
24 #need this for non-desktop
25 d-i finish-install/reboot_in_progress note
26-d-i preseed/late_command string chroot /target sh -c 'chmod g+w /var/lib/utah/testsuites; apt-get install -y --force-yes imagemagick'; [ "$?" -eq "0" ]
27
28=== modified file 'preseeds/oem.cfg'
29--- preseeds/oem.cfg 2012-12-07 20:29:54 +0000
30+++ preseeds/oem.cfg 2013-04-02 22:26:22 +0000
31@@ -38,4 +38,3 @@
32 # These are specific to this test case
33 d-i oem-config/enable boolean true
34 d-i oem-config/id string USIT_OEM
35-d-i preseed/late_command string chroot /target sh -c 'chmod g+w /var/lib/utah/testsuites; apt-get install -y --force-yes imagemagick'; [ "$?" -eq "0" ]

Subscribers

People subscribed via source and target branches