Merge pull request #65 from winnscode/winn-dev-2.2

virtme: fix virtme's kernel modules directory check

bin/virtme-prep-kdir-mods

@@ -43,6 +43,16 @@ if ! [ -f "modules.order" ]; then
     exit 1
 fi
 
+
+# Delete existing .virtme_modes/lib/modules/0.0.0/modules.dep file at the beginning,
+# and regenerated by depmod at the end. So if we are interrupted during the
+# preparation of .virtme_mods folder, the next run command can correctly trigger the
+# prepararion work again.
+
+if [ -f "$MODDIR/modules.dep" ]; then
+    rm $MODDIR/modules.dep
+fi
+
 # Set up .virtme_mods/lib/modules/0.0.0 as a module directory for this kernel,
 # but fill it with symlinks instead of actual modules.
 

virtme/commands/run.py

@@ -494,7 +494,7 @@ def find_kernel_and_mods(arch, args) -> Kernel:
             # Check if modules.order exists, otherwise fallback to mods=none
             if os.path.exists(mod_file):
                 # Check if virtme's kernel modules directory needs to be updated
-                if not os.path.exists(virtme_mods) or is_file_more_recent(
+                if not os.path.exists(virtme_mod_file) or is_file_more_recent(
                     mod_file, virtme_mod_file
                 ):
                     if modmode == "use":