token2/snapd
0
0
Fork 0
mirror of https://github.com/token2/snapd.git synced 2026-03-13 11:15:47 -07:00
Code Issues Packages Projects Releases Wiki Activity
56,449 Commits 69 Branches 314 Tags
2.57
Commit Graph

425 Commits

Author SHA1 Message Date
Michael Vogt
5595253031 bootloader/assets: add ttyS0,115200n8 to grub.cfg 
This commit will help the boot speed on most PC devices and
requested by the Taipei team.

The changes to the auto-generated parts are done via:
```
$ cd boot/assets
$ go build  -o ./genasset/genasset  ./genasset/
$ ./genasset/genasset -in ./data/grub.cfg -out grub_cfg_asset.go -name grub.cfg
```
and the `Snapd-Boot-Config-Edition` for `grub.cfg` was bumped.

Note that no changes for the recovery grub configuration are done
in this commit. I'm happy to do a follwup for this.
 2022-07-20 11:54:17 +02:00
Alfonso Sánchez-Beato
9844963c4a Merge branch 'master' into add-grub-fallback 2022-07-06 10:37:34 +01:00
Samuele Pedroni
b8e364fa47 many: switch to UC20+ in user messages (instead of UC20) 2022-04-29 14:30:24 +02:00
Alfonso Sánchez-Beato
87dcd7b7f7 b/a/grub_cfg_asset.go: update as we have changed grub.cfg 2022-04-21 13:26:14 +02:00
Alfonso Sánchez-Beato
8cf83e1524 b/a/d/grub.cfg: remove kernel_fallback varible 
Not needed anymore as we reboot instead of chainloading after a
failure.
 2022-04-21 12:53:35 +02:00
Alfonso Sánchez-Beato
b7eca4e8d0 Merge branch 'master' into add-grub-fallback 2022-04-21 12:44:19 +02:00
Michael Vogt
f045e881eb Merge pull request #11606 from bboozzoo/bboozzoo/factory-reset-spread-no-encrypt 
bootloader/assets, tests: add factory-reset mode, test non-encrypted factory-reset
 2022-04-19 15:20:48 +02:00
Paweł Stołowski
bb52a67991 Renaming related to inclusive language. 2022-04-14 14:30:47 +02:00
Michael Vogt
d9cf7c9647 Merge remote-tracking branch 'upstream/master' into bboozzoo/factory-reset-spread-no-encrypt 2022-04-11 15:30:58 +02:00
alfonsosanchezbeato
4cc40898a9 b/piboot.go: check EEPROM version for RPi4 
* b/piboot.go: check EEPROM version for RPi4

Check EEPROM version for RPi4 to make sure that tryboot is
supported. If the EEPROM need updating, return an error when
installing the kernel.

* bootloader: add unit tests for detection of RPi4 EEPROM

* bootloader/piboot: use osutil instead of using directly os.Stat

* bootloader: address review comments
 2022-04-07 19:22:08 +02:00
Alfonso Sánchez-Beato
7dd912b49d boot,bootloader: add missing grub.cfg assets mocks in some tests 
This is the same fix as commit 17fbdc7c, but in other tests.

The current code will mock the `amd64` architecture when running some
tests but it does not mock the `grub.cfg:static-cmdline` or the
`grub-recovery.cfg:static-cmdline`. This is needed because the
`bootloader/asserts` package registers the cmdline via `init()` so
this happens before the architecture is mocked in the testing
code. Hence the tests will fail when inspecting the command line on
non amd64/i386 machines.

This commit makes the mocking explicit. An alternative approach would
be to move the snippet registration out of `init()` and run it on
first boot but that has it's own problems so this other approach was
followed.
 2022-04-06 16:24:25 +02:00
Maciej Borzecki
cb691abb05 bootloader/assets: regenerate the assets after merge 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2022-04-06 14:36:12 +02:00
Maciej Borzecki
c60b4d40d6 Merge remote-tracking branch 'upstream/master' into bboozzoo/factory-reset-spread-no-encrypt 2022-04-06 14:34:46 +02:00
alfonsosanchezbeato
d5b3bcc309 b/a: do not set console in kernel command line for arm64 
* b/assets: use different kernel command line for arm64

Do not set console in the kernel command line for arm64. The defaults
are better than setting ttyS0 as in x86, also this is our choice in
server images. The kernel will choose the preferred console depending
on whether dtb or ACPI is available:

1. When having a device tree, it will take the content of the
   /chosen/stdout-path node [1]. This node is properly filled in most
   of the cases.

2. If using ACPI tables, it will look for the console in the ACPI SPCR
   table [2,3]. This is different to what is done in x86 [4], as in that
   case the SPCR table is used only if earlycon is set.

[1] https://www.kernel.org/doc/Documentation/devicetree/bindings/chosen.txt
[2] https://docs.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table
[3] https://elixir.bootlin.com/linux/v5.17/source/arch/arm64/kernel/acpi.c#L229
[4] https://elixir.bootlin.com/linux/v5.17/source/arch/x86/kernel/acpi/boot.c#L1615

* b/assets: register different grub snippets per arch

This is needed now as the kernel command line parameters will differ
across architectures.

* b/a/grub.go: fix tests for ubuntu-18.04-32

Co-authored-by: Michael Vogt <mvo@ubuntu.com>
 2022-04-05 11:27:25 +02:00
Maciej Borzecki
8a5df3a869 Merge remote-tracking branch 'upstream/master' into bboozzoo/factory-reset-spread-no-encrypt 2022-04-04 13:46:41 +02:00
Michael Vogt
bc390e47b7 Merge pull request #11591 from alfonsosanchezbeato/piboot-support-armhf 
bootloader/piboot: add support for armhf
 2022-04-01 10:23:19 +02:00
Maciej Borzecki
df919bcca2 bootloader/assets: add menu entry for factory reset mode 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2022-03-30 13:53:00 +02:00
Alfonso Sánchez-Beato
be9162997f bootloader/piboot: add support for armhf 
Add support for armhf. The difference is that in this case the
pi-kernel snap stores the device trees in a different directory.
 2022-03-28 20:10:07 +02:00
Ian Johnson
f5d75ec369 bootloader/lkenv/lkenv.go: fix typo in comment 
Signed-off-by: Ian Johnson <ian.johnson@canonical.com>
 2022-03-25 16:29:43 -05:00
Alfonso Sánchez-Beato
8650c00045 Merge branch 'master' into add-grub-fallback 2022-03-23 14:20:41 +01:00
Michael Vogt
2af863e2aa Merge pull request #11068 from alfonsosanchezbeato/piboot 
bootloader: add support for piboot
 2022-03-18 10:03:03 +01:00
Alfonso Sánchez-Beato
59cf517516 bootloader/bootloader_test: remove now unneeded test case 2022-03-16 17:22:29 +01:00
Alfonso Sánchez-Beato
5a399f258d bootloader/piboot: create empty env file always 
It does not really make sense to ship a non-empty environment in the
gadget, so remove that case.
 2022-03-16 17:22:26 +01:00
Alfonso Sánchez-Beato
419092ecc1 bootloader/piboot.md: add better description of config files and fix typo 2022-03-16 17:20:40 +01:00
Alfonso Sánchez-Beato
fdf5ae865d bootloader: add some additional unit tests for piboot 2022-03-15 11:16:47 +01:00