From 461ae7f960ba0db0b9f4cbe9bebc7a4513cb8878 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Sun, 19 Dec 2021 19:42:51 +0000
Subject: Remove fails from /custom

---
 custom/generate-specific-bootdisk.sh | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'custom/generate-specific-bootdisk.sh')

diff --git a/custom/generate-specific-bootdisk.sh b/custom/generate-specific-bootdisk.sh
index 5095399..146abbc 100755
--- a/custom/generate-specific-bootdisk.sh
+++ b/custom/generate-specific-bootdisk.sh
@@ -24,17 +24,17 @@ Required options:
 Optional options:
     --width <integer>               Resolution x axis length in px, default 1920
     --height <integer>              Resolution y axis length in px, default 1080
+    --kernel-args <string>          Additional boot-args
     --input-plist-url <url>         Specify an alternative master plist, via URL
     --master-plist-url <url>        Same as above.
     --custom-plist <filename>       Optionally change the input plist.
     --master-plist <filename>       Same as above.
     --output-bootdisk <filename>    Optionally change the bootdisk filename
     --output-plist <filename>       Optionally change the output plist filename
-    --thinkpad                      Sets ForceOcWriteFlash to true
     --help, -h, help                Display this help and exit
 
 Placeholders:   {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, {{UUID}},
-                {{ROM}}, {{WIDTH}}, {{HEIGHT}}, {{THINKPAD}}
+                {{ROM}}, {{WIDTH}}, {{HEIGHT}}
 
 Example:
     ./generate-specific-bootdisk.sh \\
@@ -184,12 +184,6 @@ while (( "$#" )); do
                 shift
             ;;
 
-    
-    --thinkpad )
-                export THINKPAD=true
-                shift
-            ;;
-
     *)
                 echo "Invalid option ${1}. Running with default values..."
                 shift
@@ -240,13 +234,6 @@ generate_bootdisk () {
         wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}"
     fi
 
-    if [[ "${THINKPAD}" == true ]]; then
-        echo "Thinkpads: setting ForceOcWriteFlash to true"
-        export THINKPAD=true
-    else
-        export THINKPAD=false
-    fi
-
     [ -e ./opencore-image-ng.sh ] \
         || { wget "${OPENCORE_IMAGE_MAKER_URL}" \
             && chmod +x opencore-image-ng.sh ; }
@@ -266,7 +253,7 @@ generate_bootdisk () {
             -e s/\{\{ROM\}\}/"${ROM}"/g \
             -e s/\{\{WIDTH\}\}/"${WIDTH:-1920}"/g \
             -e s/\{\{HEIGHT\}\}/"${HEIGHT:-1080}"/g \
-            -e s/\{\{THINKPAD\}\}/"${THINKPAD:-false}"/g \
+            -e s/\{\{KERNEL_ARGS\}\}/"${KERNEL_ARGS:-}"/g \
             "${MASTER_PLIST}" > ./tmp.config.plist || exit 1
     else
         cat <<EOF && exit 1
@@ -278,8 +265,11 @@ Error: one of the following values is missing:
 --uuid "${UUID:-MISSING}"
 --mac-address "${MAC_ADDRESS:-MISSING}"
 
+Optional:
+
 --width "${WIDTH:-1920}"
 --height "${HEIGHT:-1080}"
+--kernel-args "${KERNEL_ARGS:-}"
 
 EOF
     fi
-- 
cgit v1.2.3