ubuntu-core-initramfs

Merge ~mvo/ubuntu-core-initramfs:the-tool-local-snaps into ~canonical-foundations/ubuntu-core-initramfs:master

  1. Git
  2. lp:~mvo/ubuntu-core-initramfs
  3. the-tool-local-snaps
  4. Merge into master
Proposed by Michael Vogt
Status: Merged
Merged at revision: ca82d4a063947487ef33633513bd3c4ba02d7628
Proposed branch: ~mvo/ubuntu-core-initramfs:the-tool-local-snaps
Merge into: ~canonical-foundations/ubuntu-core-initramfs:master
Diff against target: 16 lines (+4/-1)
1 file modified
factory/usr/lib/the-tool (+4/-1)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Approve
Review via email: mp+376754@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

We have no head in initrd, I need to tweak this

Revision history for this message
Michael Vogt (mvo) wrote :

Force pushed a "fix" that does not use head

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/factory/usr/lib/the-tool b/factory/usr/lib/the-tool
2index 9213b4d..7fbcdb9 100755
3--- a/factory/usr/lib/the-tool
4+++ b/factory/usr/lib/the-tool
5@@ -3,7 +3,10 @@ set -e
6 cmd="systemd-mount --no-block --no-pager --no-ask-password"
7 # Mount base
8 #$cmd /run/mnt/ubuntu-seed/snaps/core20_*.snap /run/mnt/base
9-$cmd /run/mnt/ubuntu-seed/snaps/core20_*.snap /sysroot -pBefore=initrd-cleanup.target -pLazyUnmount=true
10+# XXX: core20 can be under /snaps and /systems/$label/snaps
11+# XXX2: snap-bootstrap initramfs-mounts should handle this correctly
12+core20=$(find /run/mnt/ubuntu-seed/ -name "core20_*.snap")
13+$cmd $core20 /sysroot -pBefore=initrd-cleanup.target -pLazyUnmount=true
14 cp /run/systemd/transient/*.mount /etc/systemd/system
15 # Mount writable
16 #$cmd --type=tmpfs tmpfs /run/mnt/ubuntu-data

Subscribers

People subscribed via source and target branches