X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=febootstrap.ml;h=9ea9885bc0a4915b1888598f5228d3678ba31ab6;hb=829022742304841be78d022bc965a02f48eba2eb;hp=58b2962908d93a83056a66c77bbfb3e9ade9954b;hpb=d60d959e8bd83793fadc7afe750d5eda94c8994b;p=febootstrap.git diff --git a/febootstrap.ml b/febootstrap.ml index 58b2962..9ea9885 100644 --- a/febootstrap.ml +++ b/febootstrap.ml @@ -151,12 +151,14 @@ let () = ); (* Split the list of files into ones for hostfiles and ones for base image. *) - let p_hmac = Str.regexp "/\\..*\\.hmac$" in + let p_hmac = Str.regexp "^\\..*\\.hmac$" in let hostfiles = ref [] and baseimgfiles = ref [] in List.iter ( fun (path, {ft_dir = dir; ft_ghost = ghost; ft_config = config} ,_ as f) -> + let file = Filename.basename path in + (* Ignore boot files, kernel, kernel modules. Supermin appliances * are booted from external kernel and initrd, and * febootstrap-supermin-helper copies the host kernel modules. @@ -176,7 +178,7 @@ let () = hostfiles := f :: !hostfiles (* Ignore FIPS files (.*.hmac) (RHBZ#654638). *) - else if Str.string_match p_hmac path 0 then () + else if Str.string_match p_hmac file 0 then () (* Ghost files are created empty in the base image. *) else if ghost then