Merge lp://staging/~xnox/debian-cd/subiquity into lp://staging/~ubuntu-cdimage/debian-cd/ubun3

Proposed by Dimitri John Ledkov
Status: Work in progress
Proposed branch: lp://staging/~xnox/debian-cd/subiquity
Merge into: lp://staging/~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 94 lines (+14/-7)
2 files modified
tools/boot/eoan/boot-amd64 (+10/-6)
tools/boot/eoan/common.sh (+4/-1)
To merge this branch: bzr merge lp://staging/~xnox/debian-cd/subiquity
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) rebase-to-focal Needs Resubmitting
Ubuntu CD Image Team Pending
Review via email: mp+366564@code.staging.launchpad.net

Commit message

  Fix whitespace & drop OEM boot options from subiquity

  Currently kernel commandline string on subiquity images has multiple
  groups of duplicate whitespace. This is because most of the
  parameteres are empty for subiquity images and are concatenated space
  delimited. Instead of fiddling with optionality of each argument,
  simply parse them with $(echo ), such that shell escaping space
  separates all arguments without any double/tripple spacing.

  Also this makes reading the variable names easier.

  Create a variable indicating subiquity based images, to skip chunks of
  unneeded boot options. E.g. OEM boot is not supported by the subiquity
  images.

Description of the change

  Fix whitespace & drop OEM boot options from subiquity

  Currently kernel commandline string on subiquity images has multiple
  groups of duplicate whitespace. This is because most of the
  parameteres are empty for subiquity images and are concatenated space
  delimited. Instead of fiddling with optionality of each argument,
  simply parse them with $(echo ), such that shell escaping space
  separates all arguments without any double/tripple spacing.

  Also this makes reading the variable names easier.

  Create a variable indicating subiquity based images, to skip chunks of
  unneeded boot options. E.g. OEM boot is not supported by the subiquity
  images.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Needs Resubmitting (rebase-to-focal)

Unmerged revisions

2028. By Dimitri John Ledkov

Fix whitespace & drop OEM boot options from subiquity

Currently kernel commandline string on subiquity images has multiple
groups of duplicate whitespace. This is because most of the
parameteres are empty for subiquity images and are concatenated space
delimited. Instead of fiddling with optionality of each argument,
simply parse them with $(echo ), such that shell escaping space
separates all arguments without any double/tripple spacing.

Also this makes reading the variable names easier.

Create a variable indicating subiquity based images, to skip chunks of
unneeded boot options. E.g. OEM boot is not supported by the subiquity
images.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches