Merge lp:~julian-edwards/maas/hwe-kernel-di into lp:maas/trunk

Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 2305
Merged at revision: 2307
Proposed branch: lp:~julian-edwards/maas/hwe-kernel-di
Merge into: lp:maas/trunk
Diff against target: 16 lines (+4/-2)
1 file modified
contrib/preseeds_v2/preseed_master (+4/-2)
To merge this branch: bzr merge lp:~julian-edwards/maas/hwe-kernel-di
Reviewer Review Type Date Requested Status
Graham Binns (community) Approve
Review via email: mp+218549@code.launchpad.net

Commit message

Remove the kernel package override in preseed_master. This allows d-i to install the right thing as dictated by the initrd in use.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

Can you please verify if this works with precise ?
If you use the default precise, i'm not sure what the default precise (non-hwe) kernel will select.

Revision history for this message
Julian Edwards (julian-edwards) wrote :

On 07/05/14 15:40, Scott Moser wrote:
> Can you please verify if this works with precise ?
> If you use the default precise, i'm not sure what the default precise (non-hwe) kernel will select.
>

Yeah, kicking that off now.

Revision history for this message
Graham Binns (gmb) :
review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

It does work, so landing this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'contrib/preseeds_v2/preseed_master'
--- contrib/preseeds_v2/preseed_master 2014-02-04 02:26:56 +0000
+++ contrib/preseeds_v2/preseed_master 2014-05-07 05:18:06 +0000
@@ -40,8 +40,10 @@
40d-i partman/confirm_nooverwrite boolean true40d-i partman/confirm_nooverwrite boolean true
41d-i partman/default_filesystem string ext441d-i partman/default_filesystem string ext4
4242
43# Use server kernel43# Enable this if you want to override to a specific kernel, such as
44d-i base-installer/kernel/image string linux-server44# linux-generic-lts-saucy, but Debian Installer should pick the right one based
45# on the boot kernel.
46#d-i base-installer/kernel/image string linux-server
4547
46# User Setup48# User Setup
47d-i passwd/root-login boolean false49d-i passwd/root-login boolean false