From 5f4b1b8ddd66f419f2f0af439df7a52a326fdd66 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Mon, 6 Nov 2023 18:58:03 +0100
Subject: [PATCH] arc: cleanup

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 files/initrd/opt/arc/arc.sh | 39 +++++++++----------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index 8854db5a..06f52140 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -828,12 +828,11 @@ function cmdlineMenu() {
   echo "2 \"Delete Cmdline item(s)\""                           >>"${TMP_PATH}/menu"
   echo "3 \"CPU Fix\""                                          >>"${TMP_PATH}/menu"
   echo "4 \"RAM Fix\""                                          >>"${TMP_PATH}/menu"
-  echo "5 \"Apparmor Fix\""                                     >>"${TMP_PATH}/menu"
-  echo "6 \"PCI/IRQ Fix\""                                      >>"${TMP_PATH}/menu"
-  echo "7 \"C-State Fix\""                                      >>"${TMP_PATH}/menu"
-  echo "8 \"Show user Cmdline\""                                >>"${TMP_PATH}/menu"
-  echo "9 \"Show Model/Build Cmdline\""                         >>"${TMP_PATH}/menu"
-  echo "0 \"Kernelpanic Behavior\""                             >>"${TMP_PATH}/menu"
+  echo "5 \"PCI/IRQ Fix\""                                      >>"${TMP_PATH}/menu"
+  echo "6 \"C-State Fix\""                                      >>"${TMP_PATH}/menu"
+  echo "7 \"Show user Cmdline\""                                >>"${TMP_PATH}/menu"
+  echo "8 \"Show Model/Build Cmdline\""                         >>"${TMP_PATH}/menu"
+  echo "9 \"Kernelpanic Behavior\""                             >>"${TMP_PATH}/menu"
   # Loop menu
   while true; do
     dialog --backtitle "$(backtitle)" --menu "Choose an Option" 0 0 0 \
@@ -924,26 +923,6 @@ function cmdlineMenu() {
         BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
         ;;
       5)
-        dialog --clear --backtitle "$(backtitle)" \
-          --title "Apparmor Fix" --menu "Fix?" 0 0 0 \
-          1 "Install" \
-          2 "Uninnstall" \
-        2>"${TMP_PATH}/resp"
-        resp="$(<"${TMP_PATH}/resp")"
-        [ -z "${resp}" ] && return 1
-        if [ ${resp} -eq 1 ]; then
-          writeConfigKey "cmdline.apparmor" "0" "${USER_CONFIG_FILE}"
-          dialog --backtitle "$(backtitle)" --title "Apparmor Fix" \
-            --aspect 18 --msgbox "Fix installed to Cmdline" 0 0
-        elif [ ${resp} -eq 2 ]; then
-          deleteConfigKey "cmdline.apparmor" "${USER_CONFIG_FILE}"
-          dialog --backtitle "$(backtitle)" --title "Apparmor Fix" \
-            --aspect 18 --msgbox "Fix uninstalled from Cmdline" 0 0
-        fi
-        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-        ;;
-      6)
         dialog --clear --backtitle "$(backtitle)" \
           --title "PCI/IRQ Fix" --menu "Fix?" 0 0 0 \
           1 "Install" \
@@ -963,7 +942,7 @@ function cmdlineMenu() {
         writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
         BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
         ;;
-      7)
+      6)
         dialog --clear --backtitle "$(backtitle)" \
           --title "C-State Fix" --menu "Fix?" 0 0 0 \
           1 "Install" \
@@ -983,7 +962,7 @@ function cmdlineMenu() {
         writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
         BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
         ;;
-      8)
+      7)
         ITEMS=""
         for KEY in ${!CMDLINE[@]}; do
           ITEMS+="${KEY}: ${CMDLINE[$KEY]}\n"
@@ -991,7 +970,7 @@ function cmdlineMenu() {
         dialog --backtitle "$(backtitle)" --title "User cmdline" \
           --aspect 18 --msgbox "${ITEMS}" 0 0
         ;;
-      9)
+      8)
         ITEMS=""
         while IFS=': ' read -r KEY VALUE; do
           ITEMS+="${KEY}: ${VALUE}\n"
@@ -999,7 +978,7 @@ function cmdlineMenu() {
         dialog --backtitle "$(backtitle)" --title "Model/Version cmdline" \
           --aspect 18 --msgbox "${ITEMS}" 0 0
         ;;
-      0)
+      9)
         rm -f "${TMP_PATH}/opts"
         echo "5 \"Reboot after 5 seconds\"" >>"${TMP_PATH}/opts"
         echo "0 \"No reboot\"" >>"${TMP_PATH}/opts"