From 5b9c7a13260750613afb6773128e91d35f29d239 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 12 Mar 2022 11:05:37 +0100
Subject: [PATCH] Preparation for other initramfs systems

---
 lib/apply_CHANGES.sh | 4 ++--
 lib/paths.sh         | 2 +-
 lib/set_MODULES.sh   | 6 +++---
 vfio-setup           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/apply_CHANGES.sh b/lib/apply_CHANGES.sh
index 35b2ac4..0bd5b0e 100755
--- a/lib/apply_CHANGES.sh
+++ b/lib/apply_CHANGES.sh
@@ -32,7 +32,7 @@ backup skipped."
 
 function copy_FILES () {
     echo "Starting copying files to the system!"
-    sudo cp -v "$SCRIPTDIR/$MODULES" "/etc/modules"
+    sudo cp -v "$SCRIPTDIR/$ETCMODULES" "/etc/modules"
     sudo cp -v "$SCRIPTDIR/$INITRAMFS/modules" "/etc/initramfs-tools/modules"
     sudo cp -v "$SCRIPTDIR/$MODPROBE/vfio.conf" "/etc/modprobe.d/vfio.conf"
 
@@ -47,7 +47,7 @@ function apply_CHANGES () {
     source "$SCRIPTDIR/lib/paths.sh"
 
     echo "Configuration is now complete and these files have been generated for your system:
-$SCRIPTDIR/$MODULES
+$SCRIPTDIR/$ETCMODULES
 $SCRIPTDIR/$INITRAMFS/modules
 $SCRIPTDIR/$MODPROBE/vfio.conf
 
diff --git a/lib/paths.sh b/lib/paths.sh
index 4b85d2d..745426f 100755
--- a/lib/paths.sh
+++ b/lib/paths.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 MODPROBE="config/etc/modprobe.d"
 INITRAMFS="config/etc/initramfs-tools"
-MODULES="config/etc/modules"
+ETCMODULES="config/etc/modules"
 DEFAULT="config/etc/default"
 QUICKEMU="config/quickemu"
\ No newline at end of file
diff --git a/lib/set_MODULES.sh b/lib/set_MODULES.sh
index 54d4683..0675edd 100755
--- a/lib/set_MODULES.sh
+++ b/lib/set_MODULES.sh
@@ -16,7 +16,7 @@ function insert_MODULES() {
     fi
 
     # Write header
-    echo "$MODULES_HEADER" > "$2"
+    echo "$ETCMODULES_HEADER" > "$2"
     
     # If vendor-reset existed from before
     if [ $VENDOR_RESET == 1 ];
@@ -36,7 +36,7 @@ vfio_virqfd
 " >> "$2"
 
     # Write the previously enabled modules under vfio in the load order
-    echo "$MODULES_ENABLED" >> "$2"
+    echo "$ETCMODULES_ENABLED" >> "$2"
 }
 
 function set_MODULES () {
@@ -45,7 +45,7 @@ function set_MODULES () {
     
     # Insert modules in the correct locations as early as possible without
     # conflicting with vendor-reset module if it is enabled
-    insert_MODULES 4 "$SCRIPTDIR/$MODULES"
+    insert_MODULES 4 "$SCRIPTDIR/$ETCMODULES"
     insert_MODULES 11 "$SCRIPTDIR/$INITRAMFS/modules"
 
     # Assign the GPU device ids to a variable
diff --git a/vfio-setup b/vfio-setup
index 537950c..e1c625f 100755
--- a/vfio-setup
+++ b/vfio-setup
@@ -103,9 +103,9 @@ echo "$CMDLINE" > "$SCRIPTDIR/config/kernel_args"
 if [ -f "/etc/modules" ];
 then
     # This copies /etc/modules without the vfio module lines
-    grep -v "vfio" "/etc/modules" > "$SCRIPTDIR/$MODULES"
+    grep -v "vfio" "/etc/modules" > "$SCRIPTDIR/$ETCMODULES"
 else
-    touch "$SCRIPTDIR/$MODULES"
+    touch "$SCRIPTDIR/$ETCMODULES"
 fi
 
 if [ -f "/etc/default/grub" ];