File tree Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Expand file tree Collapse file tree 1 file changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -104,10 +104,15 @@ fn mkfs<'a>(
104
104
label : & str ,
105
105
wipe : bool ,
106
106
opts : impl IntoIterator < Item = & ' a str > ,
107
+ dps_uuid : Option < uuid:: Uuid > ,
107
108
) -> Result < uuid:: Uuid > {
108
109
let devinfo = bootc_blockdev:: list_dev ( dev. into ( ) ) ?;
109
110
let size = ostree_ext:: glib:: format_size ( devinfo. size ) ;
110
- let u = uuid:: Uuid :: new_v4 ( ) ;
111
+ let u = if let Some ( u) = dps_uuid {
112
+ u
113
+ } else {
114
+ uuid:: Uuid :: new_v4 ( )
115
+ } ;
111
116
let mut t = Task :: new (
112
117
& format ! ( "Creating {label} filesystem ({fs}) on device {dev} (size={size})" ) ,
113
118
format ! ( "mkfs.{fs}" ) ,
@@ -383,6 +388,7 @@ pub(crate) fn install_create_rootfs(
383
388
"boot" ,
384
389
opts. wipe ,
385
390
[ ] ,
391
+ None ,
386
392
)
387
393
. context ( "Initializing /boot" ) ?,
388
394
)
@@ -403,6 +409,8 @@ pub(crate) fn install_create_rootfs(
403
409
"root" ,
404
410
opts. wipe ,
405
411
mkfs_options. iter ( ) . copied ( ) ,
412
+ // TODO: Add cli option for this
413
+ Some ( uuid:: uuid!( "6523f8ae-3eb1-4e2a-a05a-18b695ae656f" ) ) ,
406
414
) ?;
407
415
let rootarg = format ! ( "root=UUID={root_uuid}" ) ;
408
416
let bootsrc = boot_uuid. as_ref ( ) . map ( |uuid| format ! ( "UUID={uuid}" ) ) ;
You can’t perform that action at this time.
0 commit comments