mirror of
https://github.com/RROrg/rr.git
synced 2025-08-22 12:37:18 +08:00
Compare commits
No commits in common. "d20eebc734a4eb8fb790c32f7affcce3df1c669b" and "8feb56926eeaa5700263d6a11aa6b9566206782e" have entirely different histories.
d20eebc734
...
8feb56926e
BIN
docs/addons.xlsx
BIN
docs/addons.xlsx
Binary file not shown.
BIN
docs/models.xlsx
BIN
docs/models.xlsx
Binary file not shown.
@ -1302,6 +1302,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fbdev"
|
||||
@ -1634,6 +1638,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -2018,6 +2026,10 @@
|
||||
"description": "VESA VGA Framebuffer driver (Compiled by RR for DSM)",
|
||||
"depends": "cfbimgblt,cfbcopyarea,cfbfillrect,fb"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -3330,6 +3342,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -3654,6 +3670,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -4030,6 +4050,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -5330,6 +5354,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -5654,6 +5682,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -6030,6 +6062,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -7330,6 +7366,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -7654,6 +7694,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -8030,6 +8074,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -9342,6 +9390,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -9670,6 +9722,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -10046,6 +10102,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"via-rhine": {
|
||||
"description": "VIA Rhine PCI Fast Ethernet driver",
|
||||
"depends": "mii"
|
||||
@ -11334,6 +11394,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -11662,6 +11726,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -12034,6 +12102,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -12428,6 +12500,10 @@
|
||||
"description": "Generic failover infrastructure/interface",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fbdev"
|
||||
@ -12752,6 +12828,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt76": {
|
||||
"description": "MediaTek MT76x02 common routines (Compiled by RR for DSM)",
|
||||
"depends": "mac80211,cfg80211"
|
||||
@ -13204,6 +13284,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -13606,6 +13690,10 @@
|
||||
"description": "Generic failover infrastructure/interface",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fbdev"
|
||||
@ -13934,6 +14022,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt76": {
|
||||
"description": "MediaTek MT76x02 common routines (Compiled by RR for DSM)",
|
||||
"depends": "mac80211,cfg80211"
|
||||
@ -14390,6 +14482,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -15751,6 +15847,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fbdev"
|
||||
@ -16079,6 +16179,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -16463,6 +16567,10 @@
|
||||
"description": "VESA VGA Framebuffer driver (Compiled by RR for DSM)",
|
||||
"depends": "cfbimgblt,cfbcopyarea,cfbfillrect,fb"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -17775,6 +17883,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -18103,6 +18215,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -18479,6 +18595,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -19779,6 +19899,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -20111,6 +20235,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
@ -20487,6 +20615,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
@ -21803,6 +21935,10 @@
|
||||
"description": "F75373/F75375/F75387 hardware monitoring driver",
|
||||
"depends": ""
|
||||
},
|
||||
"fat": {
|
||||
"description": "",
|
||||
"depends": ""
|
||||
},
|
||||
"fb": {
|
||||
"description": "Framebuffer base",
|
||||
"depends": "fb_defio,fbdev"
|
||||
@ -22139,6 +22275,10 @@
|
||||
"description": "Fusion MPT SPI Host driver",
|
||||
"depends": "mptscsih,mptbase,scsi_transport_spi"
|
||||
},
|
||||
"msdos": {
|
||||
"description": "MS-DOS filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211"
|
||||
@ -22519,6 +22659,10 @@
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "mmc_core"
|
||||
},
|
||||
"vfat": {
|
||||
"description": "VFAT filesystem support (Compiled by RR for DSM)",
|
||||
"depends": "fat"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
"depends": ""
|
||||
|
||||
Binary file not shown.
@ -169,10 +169,6 @@ if echo "purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
|
||||
CMDLINE["SASmodel"]="1"
|
||||
fi
|
||||
|
||||
while IFS=': ' read KEY VALUE; do
|
||||
[ -n "${KEY}" ] && CMDLINE["network.${KEY}"]="${VALUE}"
|
||||
done <<<$(readConfigMap "network" "${USER_CONFIG_FILE}")
|
||||
|
||||
while IFS=': ' read KEY VALUE; do
|
||||
[ -n "${KEY}" ] && CMDLINE["${KEY}"]="${VALUE}"
|
||||
done <<<$(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
RR_VERSION="24.6.7"
|
||||
RR_VERSION="24.6.6"
|
||||
RR_RELEASE=""
|
||||
RR_TITLE="RR v${RR_VERSION}"
|
||||
|
||||
|
||||
@ -85,16 +85,7 @@ if [ ! "LOCALBUILD" = "${LOADER_DISK}" ]; then
|
||||
MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g')"
|
||||
IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
|
||||
if [ -n "${IPR}" ]; then
|
||||
IFS='/' read -r -a IPRA <<<"$IPR"
|
||||
ip addr flush dev $ETH
|
||||
ip addr add ${IPRA[0]}/${IPRA[1]:-"255.255.255.0"} dev $ETH
|
||||
if [ -n "${IPRA[2]}" ]; then
|
||||
ip route add default via ${IPRA[2]} dev $ETH
|
||||
fi
|
||||
if [ -n "${IPRA[3]:-${IPRA[2]}}" ]; then
|
||||
sed -i "/nameserver ${IPRA[3]:-${IPRA[2]}}/d" /etc/resolv.conf
|
||||
echo "nameserver ${IPRA[3]:-${IPRA[2]}}" >>/etc/resolv.conf
|
||||
fi
|
||||
ip addr add ${IPC}/24 dev ${ETH}
|
||||
sleep 1
|
||||
fi
|
||||
[ "${ETH::3}" = "eth" ] && ethtool -s ${ETH} wol g 2>/dev/null || true
|
||||
|
||||
@ -1488,53 +1488,46 @@ function editGrubCfg() {
|
||||
###############################################################################
|
||||
# Set static IP
|
||||
function setStaticIP() {
|
||||
MSG="$(TEXT "Temporary IP: (UI will not refresh)")"
|
||||
ITEMS=""
|
||||
IDX=0
|
||||
ETHX=$(ls /sys/class/net/ 2>/dev/null | grep -v lo)
|
||||
for ETH in ${ETHX}; do
|
||||
[ ${IDX} -gt 7 ] && break # Currently, only up to 8 are supported. (<==> boot.sh L96, <==> lkm: MAX_NET_IFACES)
|
||||
IDX=$((${IDX} + 1))
|
||||
MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g')"
|
||||
IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
|
||||
IFS='/' read -r -a IPRA <<<"$IPR"
|
||||
|
||||
MSG="$(TEXT "Set to ${ETH}(${MACR}): (Delete if empty)")"
|
||||
while true; do
|
||||
DIALOG --title "$(TEXT "Advanced")" \
|
||||
--form "${MSG}" 10 60 4 "address" 1 1 "${IPRA[0]}" 1 9 36 16 "netmask" 2 1 "${IPRA[1]}" 2 9 36 16 "gateway" 3 1 "${IPRA[2]}" 3 9 36 16 "dns" 4 1 "${IPRA[3]}" 4 9 36 16 \
|
||||
2>"${TMP_PATH}/resp"
|
||||
RET=$?
|
||||
case ${RET} in
|
||||
0) # ok-button
|
||||
DIALOG --title "$(TEXT "Advanced")" \
|
||||
--infobox "$(TEXT "Setting IP ...")" 0 0
|
||||
address="$(cat "${TMP_PATH}/resp" | sed -n '1p')"
|
||||
netmask="$(cat "${TMP_PATH}/resp" | sed -n '2p')"
|
||||
gateway="$(cat "${TMP_PATH}/resp" | sed -n '3p')"
|
||||
dnsname="$(cat "${TMP_PATH}/resp" | sed -n '4p')"
|
||||
if [ -z "${address}" ]; then
|
||||
deleteConfigKey "network.${MACR}" "${USER_CONFIG_FILE}"
|
||||
else
|
||||
ip addr flush dev $ETH
|
||||
ip addr add ${address}/${netmask:-"255.255.255.0"} dev $ETH
|
||||
if [ -n "${gateway}" ]; then
|
||||
ip route add default via ${gateway} dev $ETH
|
||||
fi
|
||||
if [ -n "${dnsname:-${gateway}}" ]; then
|
||||
sed -i "/nameserver ${dnsname:-${gateway}}/d" /etc/resolv.conf
|
||||
echo "nameserver ${dnsname:-${gateway}}" >>/etc/resolv.conf
|
||||
fi
|
||||
writeConfigKey "network.${MACR}" "${address}/${netmask}/${gateway}/${dnsname}" "${USER_CONFIG_FILE}"
|
||||
sleep 1
|
||||
fi
|
||||
touch ${PART1_PATH}/.build
|
||||
break
|
||||
;;
|
||||
1) # cancel-button
|
||||
break
|
||||
;;
|
||||
255) # ESC
|
||||
break 2
|
||||
;;
|
||||
esac
|
||||
done
|
||||
ITEMS+="${ETH}(${MACR}) ${IDX} 1 ${IPR:-\"\"} ${IDX} 22 36 16 "
|
||||
done
|
||||
echo ${ITEMS} >"${TMP_PATH}/opts"
|
||||
DIALOG --title "$(TEXT "Advanced")" \
|
||||
--form "${MSG}" 10 60 ${IDX} --file "${TMP_PATH}/opts" \
|
||||
2>"${TMP_PATH}/resp"
|
||||
[ $? -ne 0 ] && return
|
||||
(
|
||||
IDX=1
|
||||
for ETH in ${ETHX}; do
|
||||
MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g')"
|
||||
IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
|
||||
IPC="$(cat "${TMP_PATH}/resp" | sed -n "${IDX}p")"
|
||||
if [ -n "${IPC}" -a "${IPR}" != "${IPC}" ]; then
|
||||
if ! echo "${IPC}" | grep -q "/"; then
|
||||
IPC="${IPC}/24"
|
||||
fi
|
||||
ip addr add ${IPC} dev ${ETH}
|
||||
writeConfigKey "network.${MACR}" "${IPC}" "${USER_CONFIG_FILE}"
|
||||
sleep 1
|
||||
elif [ -z "${IPC}" ]; then
|
||||
deleteConfigKey "network.${MACR}" "${USER_CONFIG_FILE}"
|
||||
fi
|
||||
IDX=$((${IDX} + 1))
|
||||
done
|
||||
sleep 1
|
||||
IP="$(getIP)"
|
||||
[[ "${IP}" =~ ^169\.254\..* ]] && IP=""
|
||||
) 2>&1 | DIALOG --title "$(TEXT "Advanced")" \
|
||||
--progressbox "$(TEXT "Setting IP ...")" 20 100
|
||||
return
|
||||
}
|
||||
|
||||
###############################################################################
|
||||
@ -2052,7 +2045,6 @@ function initDSMNetwork {
|
||||
mount -t ext4 "${I}" "${TMP_PATH}/mdX"
|
||||
[ $? -ne 0 ] && continue
|
||||
rm -f "${TMP_PATH}/mdX/etc/sysconfig/network-scripts/ifcfg-bond"* "${TMP_PATH}/mdX/etc/sysconfig/network-scripts/ifcfg-eth"*
|
||||
rm -f "${TMP_PATH}/mdX/etc.defaults/sysconfig/network-scripts/ifcfg-bond"* "${TMP_PATH}/mdX/etc.defaults/sysconfig/network-scripts/ifcfg-eth"*
|
||||
sync
|
||||
umount "${TMP_PATH}/mdX"
|
||||
done
|
||||
@ -3514,7 +3506,7 @@ else
|
||||
echo "x \"$(TEXT "Reboot to RR")\"" >>"${TMP_PATH}/menu"
|
||||
echo "y \"$(TEXT "Reboot to Recovery")\"" >>"${TMP_PATH}/menu"
|
||||
echo "z \"$(TEXT "Reboot to Junior")\"" >>"${TMP_PATH}/menu"
|
||||
if efibootmgr | grep -q "^Boot0000"; then
|
||||
if efibootmgr | grep -q "^Boot0000" ; then
|
||||
echo "b \"$(TEXT "Reboot to BIOS")\"" >>"${TMP_PATH}/menu"
|
||||
fi
|
||||
echo "s \"$(TEXT "Back to shell")\"" >>"${TMP_PATH}/menu"
|
||||
|
||||
@ -1 +1 @@
|
||||
24.6.7
|
||||
24.6.6
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user