Merge lp:~persia/ubuntu-seeds/platform.jaunty+flash-installer-is-an-armel-boot-loader-installer into lp:~ubuntu-core-dev/ubuntu-seeds/platform.jaunty

Proposed by Emmet Hikory
Status: Merged
Merged at revision: not available
Proposed branch: lp:~persia/ubuntu-seeds/platform.jaunty+flash-installer-is-an-armel-boot-loader-installer
Merge into: lp:~ubuntu-core-dev/ubuntu-seeds/platform.jaunty
Diff against target: None lines
To merge this branch: bzr merge lp:~persia/ubuntu-seeds/platform.jaunty+flash-installer-is-an-armel-boot-loader-installer
Reviewer Review Type Date Requested Status
Loïc Minier Approve
Review via email: mp+4875@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Emmet Hikory (persia) wrote :

Just a minor cleanup. germinate is smart enough to ignore flash-kernel-installer for other architectures, but it makes the file look less pretty.

Revision history for this message
Loïc Minier (lool) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'installer'
2--- installer 2009-03-22 21:37:55 +0000
3+++ installer 2009-03-23 20:07:22 +0000
4@@ -44,7 +44,6 @@
5 * fbset-udeb
6 * file-preseed
7 * finish-install
8- * flash-kernel-installer
9 * hdparm-udeb # not currently used, but may be used by cdrom-detect in the future
10 * hw-detect
11 * initrd-preseed
12@@ -163,6 +162,7 @@
13 * devio-udeb [armel]
14 * efi-reader [ia64]
15 * elilo-installer [i386 ia64]
16+ * flash-kernel-installer [armel]
17 * grub-installer [amd64 i386 lpia]
18 * lilo-installer [amd64 i386]
19 * silo-installer [sparc]

Subscribers

People subscribed via source and target branches