File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -380,12 +380,13 @@ fn check_baseimage_root_norecurse(dir: &Dir) -> LintResult {
380380 let link = dir. read_link_contents ( "ostree" ) ?;
381381 let expected = "sysroot/ostree" ;
382382 if link. as_os_str ( ) . as_bytes ( ) != expected. as_bytes ( ) {
383- return lint_err ( "Expected /ostree -> {expected}, not {link:?}" ) ;
383+ return lint_err ( format ! ( "Expected /ostree -> {expected}, not {link:?}" ) ) ;
384384 }
385385
386386 let config = ostree_prepareroot:: require_config_from_root ( dir) ?;
387387 if !ostree_prepareroot:: overlayfs_enabled_in_config ( & config) ? {
388- return lint_err ( "{prepareroot_path} does not have composefs enabled" ) ;
388+ let path = ostree_ext:: ostree_prepareroot:: CONF_PATH ;
389+ return lint_err ( format ! ( "{path} does not have composefs enabled" ) ) ;
389390 }
390391
391392 lint_ok ( )
Original file line number Diff line number Diff line change @@ -18,7 +18,8 @@ use crate::keyfileext::KeyFileExt;
1818use crate :: ostree_manual;
1919use crate :: utils:: ResultExt ;
2020
21- pub ( crate ) const CONF_PATH : & str = "ostree/prepare-root.conf" ;
21+ /// The relative path to ostree-prepare-root's config.
22+ pub const CONF_PATH : & str = "ostree/prepare-root.conf" ;
2223
2324pub ( crate ) fn load_config ( root : & ostree:: RepoFile ) -> Result < Option < glib:: KeyFile > > {
2425 let cancellable = gio:: Cancellable :: NONE ;
You can’t perform that action at this time.
0 commit comments