Re: [Libguestfs] [supermin PATCH v2 1/1] Fix for missing /lib/modules.

Even when supplied with $SUPERMIN_MODULES, supermin tries to access /lib/modules. This directory does not exist by default in all the environments. --- src/format_ext2.ml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/format_ext2.ml b/src/format_ext2.ml index e311ea6..2888ed8 100644 --- a/src/format_ext2.ml +++ b/src/format_ext2.ml @@ -95,8 +95,18 @@ let build_ext2 debug basedir files modpath kernel_version appliance size printf "supermin: ext2: copying kernel modules\n%!"; (* Import the kernel modules. *) - ext2fs_copy_file_from_host fs "/lib" "/lib"; - ext2fs_copy_file_from_host fs "/lib/modules" "/lib/modules"; + (try + ext2fs_copy_file_from_host fs "/lib" "/lib"; + with Unix_error _ -> + ext2fs_copy_file_from_host fs "/" "/lib"; + ); + + (try + ext2fs_copy_file_from_host fs "/lib/modules" "/lib/modules"; + with Unix_error _ -> + ext2fs_copy_file_from_host fs "/" "/lib/modules"; + ); + ext2fs_copy_dir_recursively_from_host fs modpath ("/lib/modules/" ^ kernel_version);

diff --git a/src/format_ext2.ml b/src/format_ext2.ml index e311ea633deb..83eac3ddad57 100644 --- a/src/format_ext2.ml +++ b/src/format_ext2.ml @@ -95,8 +95,13 @@ let build_ext2 debug basedir files modpath kernel_version appliance size printf "supermin: ext2: copying kernel modules\n%!"; (* Import the kernel modules. *) - ext2fs_copy_file_from_host fs "/lib" "/lib"; - ext2fs_copy_file_from_host fs "/lib/modules" "/lib/modules"; + let copy_file_or_root_from_host f = + try + ext2fs_copy_file_from_host fs f f + with Unix_error _ -> + ext2fs_copy_file_from_host fs "/" f in + copy_file_or_root_from_host "/lib"; + copy_file_or_root_from_host "/lib/modules"; ext2fs_copy_dir_recursively_from_host fs modpath ("/lib/modules/" ^ kernel_version);