ubuntu-core-initramfs

Merge ~anonymouse67/ubuntu-core-initramfs:feature/uc20-uboot-boot-fix-fstab-mount into ~canonical-foundations/ubuntu-core-initramfs:master

  1. Git
  2. lp:~anonymouse67/ubuntu-core-initramfs
  3. feature/uc20-uboot-boot-fix-fstab-mount
  4. Merge into master
Proposed by Ian Johnson
Status: Merged
Merged at revision: 1d5fadcd4af936761d5786a3d2e0814920454f39
Proposed branch: ~anonymouse67/ubuntu-core-initramfs:feature/uc20-uboot-boot-fix-fstab-mount
Merge into: ~canonical-foundations/ubuntu-core-initramfs:master
Diff against target: 15 lines (+2/-2)
1 file modified
factory/usr/lib/the-modeenv (+2/-2)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Approve
Michael Vogt (community) Approve
Review via email: mp+382701@code.launchpad.net

Description of the change

Needed for new uboot uc20 layout, see https://docs.google.com/document/d/1X-qT_o52MkvsRqhwcPCqADmpCIBavA9ZtZFj-rMdvd0/edit for more details

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

This looks good to me

review: Approve
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/factory/usr/lib/the-modeenv b/factory/usr/lib/the-modeenv
2index 6c9824e..495055d 100755
3--- a/factory/usr/lib/the-modeenv
4+++ b/factory/usr/lib/the-modeenv
5@@ -6,8 +6,8 @@ if grep -q snapd_recovery_mode=run /proc/cmdline; then
6 # TODO:UC20: support other bootloaders too
7 if [ -f /run/mnt/ubuntu-boot/EFI/ubuntu/grub.cfg ]; then
8 echo '/run/mnt/ubuntu-boot/EFI/ubuntu /boot/grub none bind 0 0' >> /run/image.fstab
9- elif [ -f /run/mnt/ubuntu-boot/boot/uboot/uboot.env ]; then
10- echo '/run/mnt/ubuntu-boot/boot/uboot /boot/uboot none bind 0 0' >> /run/image.fstab
11+ elif [ -f /run/mnt/ubuntu-boot/uboot/ubuntu/boot.sel ]; then
12+ echo '/run/mnt/ubuntu-boot/uboot/ubuntu /boot/uboot none bind 0 0' >> /run/image.fstab
13 fi
14 fi
15 mount -o bind /run/image.fstab /sysroot/etc/fstab

Subscribers

People subscribed via source and target branches