From 22f6786977da9b620f194c7ce6aef47e0231b359 Mon Sep 17 00:00:00 2001 From: HikariKnight <2557889+HikariKnight@users.noreply.github.com> Date: Sat, 12 Mar 2022 12:19:48 +0100 Subject: [PATCH] Rename set_MODULES to set_INITRAMFSTOOLS to start work with other initramfs systems --- lib/get_GPU_GROUP.sh | 2 +- lib/{set_MODULES.sh => set_INITRAMFSTOOLS.sh} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename lib/{set_MODULES.sh => set_INITRAMFSTOOLS.sh} (93%) diff --git a/lib/get_GPU_GROUP.sh b/lib/get_GPU_GROUP.sh index 917a6c5..c5f017d 100755 --- a/lib/get_GPU_GROUP.sh +++ b/lib/get_GPU_GROUP.sh @@ -49,7 +49,7 @@ USB_CTL_ID=() "$SCRIPTDIR/lib/get_GPU_ROM.sh" "$ROM_PCI_ID" # Start setting up modules - exec "$SCRIPTDIR/lib/set_MODULES.sh" $GPU_DEVID + exec "$SCRIPTDIR/lib/set_INITRAMFSTOOLS.sh" $GPU_DEVID ;; *) exec "$SCRIPTDIR/lib/get_GPU.sh" diff --git a/lib/set_MODULES.sh b/lib/set_INITRAMFSTOOLS.sh similarity index 93% rename from lib/set_MODULES.sh rename to lib/set_INITRAMFSTOOLS.sh index 1a839ae..fa68934 100755 --- a/lib/set_MODULES.sh +++ b/lib/set_INITRAMFSTOOLS.sh @@ -1,6 +1,6 @@ #!/bin/bash -function insert_MODULES() { +function insert_INITRAMFSTOOLS() { # Get the header and enabled modules separately from the /etc/modules file local MODULES_HEADER local MODULES_ENABLED @@ -39,14 +39,14 @@ vfio_virqfd echo "$MODULES_ENABLED" >> "$2" } -function set_MODULES () { +function set_INITRAMFSTOOLS () { # Get the config paths source "$SCRIPTDIR/lib/paths.sh" # Insert modules in the correct locations as early as possible without # conflicting with vendor-reset module if it is enabled - insert_MODULES 4 "$SCRIPTDIR/$ETCMODULES" - insert_MODULES 11 "$SCRIPTDIR/$INITRAMFS/modules" + insert_INITRAMFSTOOLS 4 "$SCRIPTDIR/$ETCMODULES" + insert_INITRAMFSTOOLS 11 "$SCRIPTDIR/$INITRAMFS/modules" # Assign the GPU device ids to a variable GPU_DEVID="$1" @@ -100,7 +100,7 @@ softdep radeon pre: vfio vfio_pci function main () { SCRIPTDIR=$(dirname "$(which $0)" | perl -pe "s/\/\.\.\/lib//" | perl -pe "s/\/lib$//") - set_MODULES "$1" + set_INITRAMFSTOOLS "$1" } main "$1"