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

Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 2267
Merged at revision: 2267
Proposed branch: lp:~julian-edwards/maas/1.5-hwe-kernel-di
Merge into: lp:maas/1.5
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/1.5-hwe-kernel-di
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email:

Commit message

Backport trunk r2307: 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
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/preseeds_v2/preseed_master'
2--- contrib/preseeds_v2/preseed_master 2014-02-04 02:26:56 +0000
3+++ contrib/preseeds_v2/preseed_master 2014-05-08 05:28:19 +0000
4@@ -40,8 +40,10 @@
5 d-i partman/confirm_nooverwrite boolean true
6 d-i partman/default_filesystem string ext4
8-# Use server kernel
9-d-i base-installer/kernel/image string linux-server
10+# Enable this if you want to override to a specific kernel, such as
11+# linux-generic-lts-saucy, but Debian Installer should pick the right one based
12+# on the boot kernel.
13+#d-i base-installer/kernel/image string linux-server
15 # User Setup
16 d-i passwd/root-login boolean false


People subscribed via source and target branches

to all changes: