virtme: fix virtme's kernel modules directory check #65
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If vng is interrupted during the virtme-prep-kdir-mods command,
the next time we run vng we'll get the following error report:
Traceback (most recent call last):
File "/usr/bin/virtme-run", line 33, in <module>
sys.exit(load_entry_point('virtme-ng==1.19', 'console_scripts', 'virtme-run')())
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/virtme/commands/run.py", line 1314, in main
return do_it()
^^^^^^^
File "/usr/lib/python3/dist-packages/virtme/commands/run.py", line 783, in do_it
kernel = find_kernel_and_mods(arch, args)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/virtme/commands/run.py", line 486, in find_kernel_and_mods
if not os.path.exists(virtme_mods) or is_file_more_recent(
^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/virtme/commands/run.py", line 307, in is_file_more_recent
return os.stat(a).st_mtime > os.stat(b).st_mtime
^^^^^^^^^^
FileNotFoundError: [Errno 2] No such file or directory: './.virtme_mods/lib/modules/0.0.0/modules.dep'
This is because the .virtme_mods folder has been created while the
.virtme_mods/lib/modules/0.0.0/modules.dep file is still missing.
So use the $MODDIR/modules.dep file to check if virtme's kernel
modules directory needs to be updated.
This fixes issue arighi#87:
amluto/virtme#87
Signed-off-by: Winston Wen <[email protected]>
If preparation process of .virtme_mods is interrupted, the directory will be in an inconsistent state and needs to updated on the next run. Now we use $MODDIR/modules.dep file in run.py to check if virtme_mods needs to be updated, so we can delete the modules.dep file at the beginning to ensure that if the command is interrupted, we will update the directory on the next run. Signed-off-by: Winston Wen <[email protected]>
|
Applied, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.