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
51,002 Commits 69 Branches 314 Tags
2.52
Commit Graph

878 Commits

Author SHA1 Message Date
Maciej Borzecki
4289a43db6 boot: tweak unit tests 
Thanks to @mvo5 for suggestions

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-08 08:34:16 +02:00
Maciej Borzecki
488b9c3b5f boot: tweak wording in model change unit test comments 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-07 10:42:00 +02:00
Maciej Borzecki
cbeff5f1ea boot: further improvements to device change unit tests 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-06 16:20:10 +02:00
Maciej Borzecki
702fa23cdb Merge remote-tracking branch 'upstream/master' into bboozzoo/uc20-boot-device-change-model 2021-07-06 10:06:40 +02:00
Michael Vogt
49ad899515 Merge pull request #10481 from bboozzoo/bboozzoo/uc20-set-up-try-mode-when-trying-system 
boot: properly handle tried system model
 2021-07-06 09:14:57 +02:00
Maciej Borzecki
7c5ab7ba69 boot: exercise model being restored during device change 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-05 16:58:45 +02:00
Maciej Borzecki
5dd6e767a2 Merge remote-tracking branch 'upstream/master' into bboozzoo/uc20-boot-device-change-model 2021-07-05 16:53:09 +02:00
Maciej Borzecki
1857d7bde1 boot: shuffle the model around, fix typos 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-05 14:54:08 +02:00
Maciej Borzecki
2b15549677 boot: allow mocking secboot reseal call 
This is sometimes useful in integration testing.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-05 11:37:20 +02:00
Maciej Borzecki
82442bf114 boot: more detailed model check during device change 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-02 13:30:32 +02:00
Maciej Borzecki
f3aa1058f2 boot: extend device change unit tests to cover more error scenarios 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-02 13:30:14 +02:00
Maciej Borzecki
49d3712b71 boot: update model code to use new modeenv helpers 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-02 12:19:47 +02:00
Maciej Borzecki
58746f4112 boot: tweak modeenv helper names 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-02 12:19:36 +02:00
Maciej Borzecki
3543f74d29 boot: extend comments about setting and clearing try recovery sytems and related device context 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-02 11:44:22 +02:00
Maciej Borzecki
87398b59a2 boot: tweak modeenv helper names 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-02 11:44:16 +02:00
Maciej Borzecki
8d22ebeaf8 boot: set up a try model for a tried system 
A recovery system can be created during UC20 remodel, in which case, it will
carry the new model. The new model's properties that get measured during the
boot may be different from the current model's, and thus the keys need to be
resealed for this new model.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-01 13:30:09 +02:00
Maciej Borzecki
df76c13fbd boot: internal helpers for manipulating models in modeenv 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-07-01 13:30:09 +02:00
Maciej Borzecki
ba703e9541 boot: device change 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-28 14:27:06 +02:00
Maciej Borzecki
158d0cee7f boot: internal helpers for manipulating models in modeenv 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-28 14:27:06 +02:00
Maciej Borzecki
ef7257b02f boot: leave TODO about relaxing model ID comparison 
Consider relaxing the check, especially in the context of model sign key
revocation or expiration.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-25 12:35:28 +02:00
Maciej Borzecki
082467da8c boot: construct recovery boot chains for a matching system only, drop TODO 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-25 09:23:31 +02:00
Maciej Borzecki
04be286285 boot: compare model when constructing boot chains 
Be more careful when constructing the boot chains and select the recovery
systems based on their models. Depending on the indented use of the boot
chains (run & or recovery keys), allow or deny use of try model.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-24 14:00:13 +02:00
Maciej Borzecki
bdd18a53d7 boot: support resealing with a try model 
Extend the reseal code to support try model

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-21 10:07:16 +02:00
Maciej Borzecki
d26133c954 boot: use new kernel path in bootstate reseal tests 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-18 06:50:56 +02:00
Maciej Borzecki
8e9b48e1d7 boot: drop model from bootstate, make tests more realistic 
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
 2021-06-17 09:27:49 +02:00