livecd-rootfs

Merge lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing into lp://staging/livecd-rootfs

  1. live-server-kernel-futzing
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing
Merge into: lp://staging/livecd-rootfs
Diff against target: 300 lines (+121/-66) (has conflicts)
5 files modified
debian/changelog (+13/-0)
live-build/auto/config (+1/-17)
live-build/functions (+0/-31)
live-build/ubuntu-server/hooks/032-installer-squashfs.binary (+13/-18)
live-build/ubuntu-server/hooks/033-kernel-bits.binary (+94/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+359880@code.staging.launchpad.net

Commit message

* Changes to kernel handling for live-server: do not include kernel/initrd
     in filesystem.squashfs but rather install it in a throwaway layer on top
     of installer.squashfs and fish kernel, initrd and modules out of that with
     an initrd hook that records kernel metapackage name in /run and mounts
     /lib/modules.

To post a comment you must log in.
lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing updated
1737. By Michael Hudson-Doyle

changelog

1738. By Michael Hudson-Doyle

fix syntax error

Revision history for this message
Steve Langasek (vorlon) :
lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing updated
1739. By Michael Hudson-Doyle

rationalize suffix handling

1740. By Michael Hudson-Doyle

we cannot put the modules squashfses directly in /casper

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Pushed some small tweaks.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

See also

https://code.launchpad.net/~mwhudson/debian-cd/kernel-bits/+merge/359884

and

https://code.launchpad.net/~mwhudson/ubuntu-cdimage/kernel-bits/+merge/359883

lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing updated
1741. By Michael Hudson-Doyle

i was sure you could pass squashfses directly as lowerdir, apparently not

1742. By Michael Hudson-Doyle

testing vs reality

1743. By Michael Hudson-Doyle

remove cloud-initramfs-copymods and add comments

1744. By Michael Hudson-Doyle

remove cloud-initramfs-copymods harder

1745. By Michael Hudson-Doyle

ffs

Revision history for this message
Steve Langasek (vorlon) wrote :

LGTM

review: Approve
lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing updated
1746. By Michael Hudson-Doyle

debugging by guesswork: no squashfuse

1747. By Michael Hudson-Doyle

ffs

1748. By Michael Hudson-Doyle

ffs^2

1749. By Michael Hudson-Doyle

stop trying to be cute

1750. By Michael Hudson-Doyle

i h8te shell

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

This works now. New related merge proposals that must be merged first:

https://code.launchpad.net/~mwhudson/debian-cd/kernel-bits/+merge/360172

https://code.launchpad.net/~mwhudson/ubuntu-cdimage/kernel-bits-2/+merge/360039

lp://staging/~mwhudson/livecd-rootfs/live-server-kernel-futzing updated
1751. By Michael Hudson-Doyle

consistently use tabs for indentation

1752. By Michael Hudson-Doyle

remove a comment that no longer makes sense

Revision history for this message
Balint Reczey (rbalint) wrote :

The target Bazaar branch is not active anymore.
Please resubmit the merge proposal against https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/master .

Revision history for this message
Steve Langasek (vorlon) wrote :

this all landed in git.

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