debian-cd

Merge lp:~mwhudson/debian-cd/kernel-bits into lp:~ubuntu-cdimage/debian-cd/ubun3

  1. kernel-bits
  2. Merge into ubun3
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 2008
Proposed branch: lp:~mwhudson/debian-cd/kernel-bits
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 14 lines (+4/-0)
1 file modified
tools/add_live_filesystem (+4/-0)
To merge this branch: bzr merge lp:~mwhudson/debian-cd/kernel-bits
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+360172@code.launchpad.net

This proposal supersedes a proposal from 2018-11-30.

Description of the change

This is just enough to get the non-HWE case working.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve
lp:~mwhudson/debian-cd/kernel-bits updated
2008. By Steve Langasek

Merge lp:~mwhudson/debian-cd/kernel-bits

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/add_live_filesystem'
2--- tools/add_live_filesystem 2018-06-27 07:51:47 +0000
3+++ tools/add_live_filesystem 2018-12-06 08:56:03 +0000
4@@ -26,6 +26,10 @@
5 mkdir -p "$BDIR/CD1/$DIR/maas/"
6 ln "$LIVEIMAGES/$FULLARCH.maas-region.squashfs" "$BDIR/CD1/$DIR/maas/maas-region.squashfs"
7 fi
8+ if [ -e "$LIVEIMAGES/$FULLARCH.modules.squashfs" ]; then
9+ mkdir -p "$BDIR/CD1/$DIR/extras/"
10+ ln "$LIVEIMAGES/$FULLARCH.modules.squashfs" "$BDIR/CD1/$DIR/extras/modules.squashfs"
11+ fi
12
13 if [ -e "$LIVEIMAGES/$FULLARCH.installer.squashfs" ]; then
14 ln "$LIVEIMAGES/$FULLARCH.installer.squashfs" "$BDIR/CD1/$DIR/installer.squashfs"

Subscribers

People subscribed via source and target branches