Merge lp://staging/~mvo/goget-ubuntu-touch/minimal-first-boot into lp://staging/goget-ubuntu-touch
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~mvo/goget-ubuntu-touch/minimal-first-boot |
| Merge into: | lp://staging/goget-ubuntu-touch |
| Diff against target: |
1819 lines (+1145/-164) (has conflicts) 17 files modified
debian/changelog (+15/-0) debian/control (+14/-0) dependencies.tsv (+6/-1) diskimage/bootloader.go (+21/-12) diskimage/common.go (+99/-80) diskimage/common_test.go (+14/-14) diskimage/core_grub.go (+31/-27) diskimage/core_uboot.go (+32/-16) diskimage/partition.go (+1/-0) snapcraft.yaml (+35/-0) ubuntu-device-flash/common.go (+3/-3) ubuntu-device-flash/core.go (+12/-5) ubuntu-device-flash/helpers.go (+89/-0) ubuntu-device-flash/helpers_test.go (+135/-0) ubuntu-device-flash/main.go (+1/-1) ubuntu-device-flash/snappy.go (+513/-5) ubuntu-device-flash/snappy_compat_yaml.go (+124/-0) Text conflict in debian/changelog Text conflict in debian/control Text conflict in dependencies.tsv Text conflict in diskimage/bootloader.go Text conflict in diskimage/common.go Text conflict in diskimage/core_grub.go Text conflict in diskimage/core_uboot.go Text conflict in ubuntu-device-flash/core.go Text conflict in ubuntu-device-flash/snappy.go |
| To merge this branch: | bzr merge lp://staging/~mvo/goget-ubuntu-touch/minimal-first-boot |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This implements creating a ubuntu core 16 image with minimal support from snapd (grub only for now). Most importantly the snap install part is dropped and the code only downloads and drops the files into the right location.
This is the basis for the `firstboot` part of snapd. Also note that this is only a temporary tree that will be replaced with ubuntu-image. However ubuntu-image can still use this code (and layout) as a blueprint how to generate the basic dir layout. Plus for ubuntu-image we will need something like "snap-bootstrap" as the python-code will not be able to call into the go code.
Unmerged revisions
- 299. By Michael Vogt
-
remove boot-assets/
uEnv.txt from compat yaml - 298. By Michael Vogt
-
remove some dead code
- 297. By Michael Vogt
-
add snapcraft.yaml that includes the "snap" command
- 296. By Michael Vogt
-
ubuntu-
device- flash/main. go: fix cmdline parsing - 295. By Michael Vogt
-
take model assertion as input instead of of --kernel/--os
- 294. By Michael Vogt
-
fix copy
- 293. By Michael Vogt
-
cherry pick r290 from lp:~mvo/goget-ubuntu-touch/minimal-first-boot-no-prepare-image
- 292. By Michael Vogt
-
update to latest create-image api
- 291. By Michael Vogt
-
use new `snap weld`
- 290. By Michael Vogt
-
remove dead code
