mgetadmin/arc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree: add ipv6 switch

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium
2023-12-23 20:29:35 +01:00
parent 57a5c74537
commit d0c11fc1d5
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
files/initrd/opt/arc/arc.sh
View File

@@ -60,6 +60,7 @@ MACSYS="$(readConfigKey "arc.macsys" "${USER_CONFIG_FILE}")"
ODP="$(readConfigKey "arc.odp" "${USER_CONFIG_FILE}")"
HDDSORT="$(readConfigKey "arc.hddsort" "${USER_CONFIG_FILE}")"
STATICIP="$(readConfigKey "arc.staticip" "${USER_CONFIG_FILE}")"
ARCIPV6="$(readConfigKey "arc.ipv6" "${USER_CONFIG_FILE}")"
###############################################################################
# Mounts backtitle dynamically
@@ -2275,6 +2276,7 @@ function resetLoader() {
initConfigKey "arc.sn" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.mac1" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.staticip" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.ipv6" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.directboot" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.remap" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.usbmount" "false" "${USER_CONFIG_FILE}"
@@ -2289,6 +2291,8 @@ function resetLoader() {
initConfigKey "arc.bootcount" "0" "${USER_CONFIG_FILE}"
initConfigKey "arc.odp" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.hddsort" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.usbinstall" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.usbdevice" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
initConfigKey "device" "{}" "${USER_CONFIG_FILE}"
MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
@@ -2367,6 +2371,7 @@ while true; do
fi
echo "p \"Arc Settings \" " >>"${TMP_PATH}/menu"
echo ". \"DHCP/Static Loader IP \" " >>"${TMP_PATH}/menu"
echo "u \"Use IPv6: \Z4${ARCIPV6}\Zn \" " >>"${TMP_PATH}/menu"
fi
if [ "${ADVOPTS}" = "true" ]; then
echo "5 \"\Z1Hide Advanced Options\Zn \" " >>"${TMP_PATH}/menu"
@@ -2456,6 +2461,10 @@ while true; do
p) ONLYPATCH="true" && arcsettings; NEXT="p" ;;
h) usbMenu; NEXT="h" ;;
.) staticIPMenu; NEXT="." ;;
c) [ "${ARCIPV6}" = "true" ] && KERNELLOAD='false' || KERNELLOAD='true'
writeConfigKey "arc.ipv6" "${ARCIPV6}" "${USER_CONFIG_FILE}"
NEXT="c"
;;
# Advanced Section
5) [ "${ADVOPTS}" = "true" ] && ADVOPTS='false' || ADVOPTS='true'
ADVOPTS="${ADVOPTS}"

3
files/initrd/opt/arc/init.sh
View File

@@ -40,6 +40,7 @@ initConfigKey "arc.pathash" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.sn" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.mac1" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.staticip" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.ipv6" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.directboot" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.remap" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.usbmount" "false" "${USER_CONFIG_FILE}"
@@ -54,6 +55,8 @@ initConfigKey "arc.macsys" "hardware" "${USER_CONFIG_FILE}"
initConfigKey "arc.bootcount" "0" "${USER_CONFIG_FILE}"
initConfigKey "arc.odp" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.hddsort" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.usbinstall" "false" "${USER_CONFIG_FILE}"
initConfigKey "arc.usbdevice" "" "${USER_CONFIG_FILE}"
initConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
initConfigKey "device" "{}" "${USER_CONFIG_FILE}"

18
files/initrd/opt/arc/ramdisk-patch.sh
View File

@@ -184,16 +184,22 @@ echo "inetd" >>"${RAMDISK_PATH}/addons/addons.sh"
${ARC_PATH}/depmod -a -b ${RAMDISK_PATH} 2>/dev/null
# Network card configuration file
for N in $(seq 0 7); do
echo -e "DEVICE=eth${N}\nBOOTPROTO=dhcp\nONBOOT=yes\nIPV6INIT=no" >"${RAMDISK_PATH}/etc/sysconfig/network-scripts/ifcfg-eth${N}"
done
IPV6="$(readConfigKey "arc.ipv6" "${USER_CONFIG_FILE}")"
if [ "${IPV6}" = "false" ]; then
for N in $(seq 0 7); do
echo -e "DEVICE=eth${N}\nBOOTPROTO=dhcp\nONBOOT=yes\nIPV6INIT=no" >"${RAMDISK_PATH}/etc/sysconfig/network-scripts/ifcfg-eth${N}"
done
elif [ "${IPV6}" = "false" ]; then
for N in $(seq 0 7); do
echo -e "DEVICE=eth${N}\nBOOTPROTO=dhcp\nONBOOT=yes\nIPV6INIT=dhcp\nIPV6_ACCEPT_RA=1" >"${RAMDISK_PATH}/etc/sysconfig/network-scripts/ifcfg-eth${N}"
done
fi
# SA6400 patches
if [ "${PLATFORM}" = "epyc7002" ]; then
echo -e "Apply Epyc7002 Fixes"
sed -i 's#/dev/console#/var/log/lrc#g' ${RAMDISK_PATH}/usr/bin/busybox
sed -i '/^echo "START/a \\nmknod -m 0666 /dev/console c 1 3' ${RAMDISK_PATH}/linuxrc.syno
sed -i 's/WithInternal=0/WithInternal=1/' ${RAMDISK_PATH}/linuxrc.syno.impl
fi
# USB install
@@ -202,7 +208,7 @@ USBDEVICE="$(readConfigKey "arc.usbdevice" "${USER_CONFIG_FILE}")"
if [ "${USBINSTALL}" = "true" ]; then
echo -e "Apply USBInstall Fixes"
sed -i 's/WithInternal=0/WithInternal=1/' ${RAMDISK_PATH}/linuxrc.syno.impl
sed -i 's/dev/sda/dev/{USBDEVICE}/' ${RAMDISK_PATH}/usr/syno/web/webman/get_state.cgi
sed -i "s/sda/${USBDEVICE}/" ${RAMDISK_PATH}/usr/syno/web/webman/get_state.cgi
_set_conf_kv "support_buildin_storage" "true" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&1 || dieLog
fi
@@ -214,4 +220,4 @@ else
fi
# Clean
rm -rf "${RAMDISK_PATH}"
#rm -rf "${RAMDISK_PATH}"