File tree Expand file tree Collapse file tree 2 files changed +4
-7
lines changed
crates/lib/src/bootc_composefs Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -38,7 +38,6 @@ use crate::bootc_composefs::status::get_sorted_uki_boot_entries;
38
38
use crate :: composefs_consts:: { TYPE1_ENT_PATH , TYPE1_ENT_PATH_STAGED } ;
39
39
use crate :: parsers:: bls_config:: { BLSConfig , BLSConfigType } ;
40
40
use crate :: parsers:: grub_menuconfig:: MenuEntry ;
41
- use crate :: spec:: ImageReference ;
42
41
use crate :: task:: Task ;
43
42
use crate :: {
44
43
composefs_consts:: {
@@ -990,11 +989,7 @@ pub(crate) fn setup_composefs_boot(
990
989
write_composefs_state (
991
990
& root_setup. physical_root_path ,
992
991
id,
993
- & ImageReference {
994
- image : state. source . imageref . name . clone ( ) ,
995
- transport : state. source . imageref . transport . to_string ( ) ,
996
- signature : None ,
997
- } ,
992
+ & crate :: spec:: ImageReference :: from ( state. target_imgref . clone ( ) ) ,
998
993
false ,
999
994
boot_type,
1000
995
boot_digest,
Original file line number Diff line number Diff line change @@ -113,7 +113,9 @@ pub(crate) fn write_composefs_state(
113
113
boot_type : BootType ,
114
114
boot_digest : Option < String > ,
115
115
) -> Result < ( ) > {
116
- let state_path = root_path. join ( format ! ( "{STATE_DIR_RELATIVE}/{}" , deployment_id. to_hex( ) ) ) ;
116
+ let state_path = root_path
117
+ . join ( STATE_DIR_RELATIVE )
118
+ . join ( deployment_id. to_hex ( ) ) ;
117
119
118
120
create_dir_all ( state_path. join ( "etc" ) ) ?;
119
121
You can’t perform that action at this time.
0 commit comments