From 9574727c71c65db1ba4ec283114ee429eed166d9 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Thu, 25 Jul 2024 17:18:54 +0200 Subject: [PATCH] arc: remove ipv6 switch and enable it globally Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc.sh | 23 ----------------------- files/p1/boot/grub/grub.cfg | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index e0dbd1bb..823affec 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -974,7 +974,6 @@ else echo "W \"RD Compression: \Z4${RD_COMPRESSED}\Zn \" " >>"${TMP_PATH}/menu" echo "X \"Sata DOM: \Z4${SATADOM}\Zn \" " >>"${TMP_PATH}/menu" echo "u \"Switch LKM Version: \Z4${LKM}\Zn \" " >>"${TMP_PATH}/menu" - echo "c \"Switch IPv6 Support: \Z4${IPV6}\Zn \" " >>"${TMP_PATH}/menu" echo "B \"Grep DSM Config from Backup \" " >>"${TMP_PATH}/menu" echo "L \"Grep Logs from dbgutils \" " >>"${TMP_PATH}/menu" echo "w \"Reset Loader to Defaults \" " >>"${TMP_PATH}/menu" @@ -1126,28 +1125,6 @@ else LOADEROPTS="${LOADEROPTS}" NEXT="8" ;; - c) [ "${IPV6}" == "true" ] && IPV6='false' || IPV6='true' - if [ "${IPV6}" == "true" ]; then - writeConfigKey "arc.ipv6" "true" "${USER_CONFIG_FILE}" - if cat "${USER_GRUB_CONFIG}" | grep -q 'ipv6.disable=1'; then - sed -i 's/ipv6.disable=1/ipv6.disable=0/g' "${USER_GRUB_CONFIG}" - dialog --backtitle "$(backtitle)" --title "Arc Boot" \ - --infobox "Rebooting with IPv6 Support!" 4 30 - sleep 3 - rebootTo config - fi - elif [ "${IPV6}" == "false" ]; then - writeConfigKey "arc.ipv6" "false" "${USER_CONFIG_FILE}" - if cat "${USER_GRUB_CONFIG}" | grep -q 'ipv6.disable=0'; then - sed -i 's/ipv6.disable=0/ipv6.disable=1/g' "${GRUB_CONFIG_FILE}" - dialog --backtitle "$(backtitle)" --title "Arc Boot" \ - --infobox "Rebooting without IPv6 Support!" 4 30 - sleep 3 - rebootTo config - fi - fi - NEXT="c" - ;; l) editUserConfig; NEXT="l" ;; w) resetLoader; NEXT="w" ;; v) saveMenu; NEXT="v" ;; diff --git a/files/p1/boot/grub/grub.cfg b/files/p1/boot/grub/grub.cfg index 8aac8223..c36d201f 100644 --- a/files/p1/boot/grub/grub.cfg +++ b/files/p1/boot/grub/grub.cfg @@ -78,7 +78,7 @@ set menu_color_normal=white/black set menu_color_highlight=white/red set color_normal=white/black -set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 ipv6.disable=1 nox2apic nomodeset iommu=off" +set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 nox2apic nomodeset iommu=off" search --set=root --label "ARC3" if [ -e /automated ]; then