mirror of
https://github.com/RROrg/rr.git
synced 2025-12-18 01:59:31 +08:00
Compare commits
No commits in common. "8c66647eb30e6e7c418219b1d788a3a9ffca4f3d" and "6a3662840055f4e9ff5839bdd559141dfc74d376" have entirely different histories.
8c66647eb3
...
6a36628400
@ -362,21 +362,21 @@
|
||||
"nvmesystem": {
|
||||
"system": false,
|
||||
"description": {
|
||||
"en_US": "Author: jim3ma. Installing the system in an environment with only m2 disk (current only support 7.2).",
|
||||
"ar_SA": "المؤلف: jim3ma. تثبيت النظام في بيئة تحتوي فقط على قرص m2 (الحالي يدعم فقط 7.2).",
|
||||
"de_DE": "Autor: jim3ma. Installation des Systems in einer Umgebung mit nur einer m2-Disk (derzeit nur 7.2 unterstützt).",
|
||||
"es_ES": "Autor: jim3ma. Instalación del sistema en un entorno con solo disco m2 (actualmente solo admite 7.2).",
|
||||
"fr_FR": "Auteur: jim3ma. Installation du système dans un environnement avec un seul disque m2 (actuellement uniquement 7.2 pris en charge).",
|
||||
"ja_JP": "著者：jim3ma。 m2ディスクのみの環境にシステムをインストールします（現在は7.2のみサポート）。",
|
||||
"ko_KR": "저자: jim3ma. m2 디스크만 있는 환경에서 시스템을 설치합니다 (현재 7.2만 지원).",
|
||||
"ru_RU": "Автор: jim3ma. Установка системы в среде только с диском m2 (в настоящее время поддерживается только 7.2).",
|
||||
"th_TH": "ผู้เขียน: jim3ma. การติดตั้งระบบในสภาพแวดล้อมที่มีดิสก์ m2 เท่านั้น (ในปัจจุบันรองรับเฉพาะ 7.2 เท่านั้น)",
|
||||
"tr_TR": "Yazar: jim3ma. Yalnızca m2 disk olan bir ortamda sistem kurulumu (şu anda yalnızca 7.2 desteklenmektedir).",
|
||||
"uk_UA": "Автор: jim3ma. Встановлення системи в середовищі лише з диском m2 (наразі підтримується лише 7.2).",
|
||||
"vi_VN": "Tác giả: jim3ma. Cài đặt hệ thống trong môi trường chỉ có ổ m2 (hiện chỉ hỗ trợ 7.2).",
|
||||
"zh_CN": "作者：jim3ma。 在仅有 m2 硬盘的环境中安装系统（当前仅支持 7.2）。",
|
||||
"zh_HK": "作者：jim3ma。 在僅有 m2 硬碟的環境中安裝系統（當前僅支持 7.2）。",
|
||||
"zh_TW": "作者：jim3ma。 在僅有 m2 硬碟的環境中安裝系統（當前僅支持 7.2）。"
|
||||
"en_US": "Author: jim3ma. Install the system on only m2 disk (current only support 7.2).",
|
||||
"ar_SA": "المؤلف: jim3ma. قم بتثبيت النظام على القرص m2 فقط (الدعم الحالي لـ 7.2 فقط).",
|
||||
"de_DE": "Autor: jim3ma. Installiert das System nur auf den m2-Disk (aktuell nur 7.2 unterstützt).",
|
||||
"es_ES": "Autor: jim3ma. Instala el sistema solo en el disco m2 (actualmente solo admite 7.2).",
|
||||
"fr_FR": "Auteur: jim3ma. Installe le système uniquement sur le disque m2 (actuellement, seul 7.2 est pris en charge).",
|
||||
"ja_JP": "作者: jim3ma。システムをm2ディスクにのみインストールします（現在、7.2 のみサポート）。",
|
||||
"ko_KR": "저자: jim3ma. 7.2 만을 지원하는 m2 디스크에 시스템을 설치합니다.",
|
||||
"ru_RU": "Автор: jim3ma. Установка системы только на m2-дисков (текущий только поддерживает 7.2).",
|
||||
"th_TH": "ผู้เขียน: jim3ma. ติดตั้งระบบบนดิสก์ m2 เท่านั้น (ในปัจจุบันรองรับเฉพาะ 7.2 เท่านั้น)",
|
||||
"tr_TR": "Yazar: jim3ma. Sistemi yalnızca m2 diske yükler (şu anda yalnızca 7.2 desteklenir).",
|
||||
"uk_UA": "Автор: jim3ma. Встановлення системи лише на диск m2 (наразі підтримується лише 7.2).",
|
||||
"vi_VN": "Tác giả: jim3ma. Cài đặt hệ thống chỉ trên ổ đĩa m2 (hiện chỉ hỗ trợ 7.2).",
|
||||
"zh_CN": "作者：jim3ma。仅在m2磁盘上安装系统（当前仅支持 7.2）。",
|
||||
"zh_HK": "作者：jim3ma。僅在m2磁碟上安裝系統（目前僅支援 7.2）。",
|
||||
"zh_TW": "作者：jim3ma。僅在m2磁碟上安裝系統（目前僅支援 7.2）。"
|
||||
}
|
||||
},
|
||||
"nvmevolume": {
|
||||
|
||||
BIN
docs/addons.xlsx
BIN
docs/addons.xlsx
Binary file not shown.
BIN
docs/models.xlsx
BIN
docs/models.xlsx
Binary file not shown.
@ -8232,10 +8232,6 @@
|
||||
"description": "Console Rotation (180 degrees) Support",
|
||||
"depends": "fb,softcursor"
|
||||
},
|
||||
"fbdev": {
|
||||
"description": "Framebuffer console primary device detection (Compiled by RR for DSM)",
|
||||
"depends": ""
|
||||
},
|
||||
"font": {
|
||||
"description": "Console Fonts",
|
||||
"depends": ""
|
||||
@ -21013,11 +21009,11 @@
|
||||
},
|
||||
"aqc111": {
|
||||
"description": "Aquantia AQtion USB to 5/2.5GbE Controllers",
|
||||
"depends": "usbnet"
|
||||
"depends": "usbnet,usbcore"
|
||||
},
|
||||
"asix": {
|
||||
"description": "ASIX AX8817X based USB 2.0 Ethernet Devices",
|
||||
"depends": "mii,libphy,usbnet"
|
||||
"depends": "mii,libphy,usbnet,usbcore"
|
||||
},
|
||||
"atkbd": {
|
||||
"description": "AT and PS/2 keyboard driver",
|
||||
@ -21041,7 +21037,7 @@
|
||||
},
|
||||
"ax88179_178a": {
|
||||
"description": "ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet Devices",
|
||||
"depends": "usbnet,mii"
|
||||
"depends": "usbnet,usbcore,mii"
|
||||
},
|
||||
"b44": {
|
||||
"description": "Broadcom 44xx/47xx 10/100 PCI ethernet driver",
|
||||
@ -21089,11 +21085,11 @@
|
||||
},
|
||||
"cdc_ether": {
|
||||
"description": "USB CDC Ethernet devices",
|
||||
"depends": "usbnet"
|
||||
"depends": "usbnet,usbcore"
|
||||
},
|
||||
"cdc_ncm": {
|
||||
"description": "USB CDC NCM host driver",
|
||||
"depends": "usbnet"
|
||||
"depends": "usbnet,usbcore"
|
||||
},
|
||||
"cdrom": {
|
||||
"description": "Uniform CD-ROM driver (Compiled by RR for DSM)",
|
||||
@ -21121,7 +21117,7 @@
|
||||
},
|
||||
"ch341": {
|
||||
"description": "USB CH341 Single Port Serial Driver (Compiled by RR for DSM)",
|
||||
"depends": "usbserial"
|
||||
"depends": "usbserial,usbcore"
|
||||
},
|
||||
"cls_fw": {
|
||||
"description": "Classifier for fwmark (Compiled by RR for DSM)",
|
||||
@ -21141,7 +21137,7 @@
|
||||
},
|
||||
"cp210x": {
|
||||
"description": "Silicon Labs CP210x RS232 serial adaptor driver",
|
||||
"depends": "usbserial"
|
||||
"depends": "usbserial,usbcore"
|
||||
},
|
||||
"cpufreq_conservative": {
|
||||
"description": "A dynamic cpufreq governor for Low Latency Frequency Transition capable processors optimised for use in a battery environment",
|
||||
@ -21209,7 +21205,7 @@
|
||||
},
|
||||
"dm9601": {
|
||||
"description": "Davicom DM96xx USB 10/100 ethernet devices",
|
||||
"depends": "usbnet,mii"
|
||||
"depends": "usbnet,usbcore,mii"
|
||||
},
|
||||
"dme1737": {
|
||||
"description": "DME1737 sensors",
|
||||
@ -21221,19 +21217,19 @@
|
||||
},
|
||||
"dvb-usb-dib0700": {
|
||||
"description": "Driver for devices based on DiBcom DiB0700 - USB bridge",
|
||||
"depends": "dib7000m,dib9000,dibx000_common,dvb-usb,dib0090,dib0070,dib3000mc,rc-core"
|
||||
"depends": "dib7000m,dib9000,dibx000_common,dvb-usb,dib0090,dib0070,dib3000mc,usbcore,rc-core"
|
||||
},
|
||||
"dvb-usb-dvbsky": {
|
||||
"description": "Driver for DVBSky USB",
|
||||
"depends": "dvb_usb_v2,dvb-core,rc-core,m88ds3103"
|
||||
"depends": "dvb_usb_v2,dvb-core,usbcore,rc-core,m88ds3103"
|
||||
},
|
||||
"dvb-usb": {
|
||||
"description": "A library module containing commonly used USB and DVB function USB DVB devices",
|
||||
"depends": "rc-core,dvb-core"
|
||||
"depends": "rc-core,dvb-core,usbcore"
|
||||
},
|
||||
"dvb_usb_v2": {
|
||||
"description": "DVB USB common",
|
||||
"depends": "rc-core,dvb-core"
|
||||
"depends": "rc-core,dvb-core,usbcore"
|
||||
},
|
||||
"e1000": {
|
||||
"description": "Intel(R) PRO/1000 Network Driver (Compiled by RR for DSM)",
|
||||
@ -21313,7 +21309,7 @@
|
||||
},
|
||||
"ftdi_sio": {
|
||||
"description": "USB FTDI Serial Converters Driver",
|
||||
"depends": "usbserial"
|
||||
"depends": "usbserial,usbcore"
|
||||
},
|
||||
"gasket": {
|
||||
"description": "Google Gasket driver framework",
|
||||
@ -21609,7 +21605,7 @@
|
||||
},
|
||||
"mt7601u": {
|
||||
"description": "Mediatek MT7601U USB driver",
|
||||
"depends": "mac80211,cfg80211"
|
||||
"depends": "mac80211,cfg80211,usbcore"
|
||||
},
|
||||
"mtk-sd": {
|
||||
"description": "MediaTek SD/MMC Card Driver",
|
||||
@ -21629,7 +21625,7 @@
|
||||
},
|
||||
"mwifiex_usb": {
|
||||
"description": "Marvell WiFi-Ex USB Driver version1.0",
|
||||
"depends": "mwifiex"
|
||||
"depends": "mwifiex,usbcore"
|
||||
},
|
||||
"nct6683": {
|
||||
"description": "NCT6683D driver (Compiled by RR for DSM)",
|
||||
@ -21657,7 +21653,7 @@
|
||||
},
|
||||
"pl2303": {
|
||||
"description": "Prolific PL2303 USB to serial adaptor driver",
|
||||
"depends": "usbserial"
|
||||
"depends": "usbserial,usbcore"
|
||||
},
|
||||
"pmbus": {
|
||||
"description": "Generic PMBus driver",
|
||||
@ -21669,7 +21665,7 @@
|
||||
},
|
||||
"prism2_usb": {
|
||||
"description": "Prism2 USB driver (Compiled by RR for DSM)",
|
||||
"depends": "cfg80211"
|
||||
"depends": "cfg80211,usbcore"
|
||||
},
|
||||
"processor": {
|
||||
"description": "ACPI Processor Driver",
|
||||
@ -21717,7 +21713,7 @@
|
||||
},
|
||||
"r8152": {
|
||||
"description": "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters (Compiled by RR for DSM)",
|
||||
"depends": ""
|
||||
"depends": "usbcore"
|
||||
},
|
||||
"r8168": {
|
||||
"description": "RealTek RTL-8168 Gigabit Ethernet driver (Compiled by RR for DSM)",
|
||||
@ -21749,7 +21745,7 @@
|
||||
},
|
||||
"rndis_host": {
|
||||
"description": "USB Host side RNDIS driver",
|
||||
"depends": "usbnet,cdc_ether"
|
||||
"depends": "usbnet,usbcore,cdc_ether"
|
||||
},
|
||||
"rtc-cmos": {
|
||||
"description": "Driver for PC-style 'CMOS' RTCs",
|
||||
@ -21757,7 +21753,7 @@
|
||||
},
|
||||
"rtl8187": {
|
||||
"description": "RTL8187/RTL8187B USB wireless driver",
|
||||
"depends": "mac80211,eeprom_93cx6,cfg80211"
|
||||
"depends": "mac80211,eeprom_93cx6,cfg80211,usbcore"
|
||||
},
|
||||
"rtl8188ee": {
|
||||
"description": "Realtek 8188E 802.11n PCI wireless",
|
||||
@ -21777,7 +21773,7 @@
|
||||
},
|
||||
"rtl8192cu": {
|
||||
"description": "Realtek 8192C/8188C 802.11n USB wireless",
|
||||
"depends": "mac80211,rtlwifi,rtl8192c-common,rtl_usb"
|
||||
"depends": "mac80211,rtlwifi,rtl8192c-common,rtl_usb,usbcore"
|
||||
},
|
||||
"rtl8192de": {
|
||||
"description": "Realtek 8192DE 802.11n Dual Mac PCI wireless",
|
||||
@ -21809,7 +21805,7 @@
|
||||
},
|
||||
"rtl8xxxu": {
|
||||
"description": "RTL8XXXu USB mac80211 Wireless LAN Driver",
|
||||
"depends": "mac80211"
|
||||
"depends": "usbcore,mac80211"
|
||||
},
|
||||
"rtl_pci": {
|
||||
"description": "PCI basic driver for rtlwifi",
|
||||
@ -21817,7 +21813,7 @@
|
||||
},
|
||||
"rtl_usb": {
|
||||
"description": "USB basic driver for rtlwifi",
|
||||
"depends": "mac80211,rtlwifi"
|
||||
"depends": "mac80211,rtlwifi,usbcore"
|
||||
},
|
||||
"rtlwifi": {
|
||||
"description": "Realtek 802.11n PCI wireless core",
|
||||
@ -21833,7 +21829,7 @@
|
||||
},
|
||||
"rtsx_usb": {
|
||||
"description": "Realtek USB Card Reader Driver",
|
||||
"depends": ""
|
||||
"depends": "usbcore"
|
||||
},
|
||||
"rtsx_usb_sdmmc": {
|
||||
"description": "Realtek USB SD/MMC Card Host Driver",
|
||||
@ -21965,15 +21961,15 @@
|
||||
},
|
||||
"usbnet": {
|
||||
"description": "USB network driver framework",
|
||||
"depends": "mii"
|
||||
"depends": "usbcore,mii"
|
||||
},
|
||||
"usbserial": {
|
||||
"description": "USB Serial Driver core",
|
||||
"depends": ""
|
||||
"depends": "usbcore"
|
||||
},
|
||||
"ushc": {
|
||||
"description": "USB SD Host Controller driver",
|
||||
"depends": "mmc_core"
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"vfio": {
|
||||
"description": "VFIO - User Level meta-driver",
|
||||
@ -22033,7 +22029,7 @@
|
||||
},
|
||||
"vub300": {
|
||||
"description": "VUB300 USB to SD/MMC/SDIO adapter driver",
|
||||
"depends": "mmc_core"
|
||||
"depends": "usbcore,mmc_core"
|
||||
},
|
||||
"w83781d": {
|
||||
"description": "W83781D driver",
|
||||
|
||||
Binary file not shown.
@ -62,7 +62,7 @@ LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
|
||||
|
||||
DMI="$(dmesg 2>/dev/null | grep -i "DMI:" | sed 's/\[.*\] DMI: //i')"
|
||||
CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))"
|
||||
MEM="$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo 2>/dev/null) MB"
|
||||
MEM="$(free -m 2>/dev/null | grep -i mem | awk '{print $2}') MB"
|
||||
|
||||
echo -e "$(TEXT "Model: ") \033[1;36m${MODEL}(${PLATFORM})\033[0m"
|
||||
echo -e "$(TEXT "Version: ") \033[1;36m${PRODUCTVER}(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))\033[0m"
|
||||
@ -247,12 +247,12 @@ else
|
||||
done
|
||||
BOOTWAIT="$(readConfigKey "bootwait" "${USER_CONFIG_FILE}")"
|
||||
[ -z "${BOOTWAIT}" ] && BOOTWAIT=10
|
||||
w -h 2>/dev/null | awk '{print $1" "$2" "$3}' >WB
|
||||
w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
|
||||
MSG=""
|
||||
while test ${BOOTWAIT} -ge 0; do
|
||||
MSG="$(printf "\033[1;33m$(TEXT "%2ds (Changing access(ssh/web) status will interrupt boot)")\033[0m" "${BOOTWAIT}")"
|
||||
echo -en "\r${MSG}"
|
||||
w -h 2>/dev/null | awk '{print $1" "$2" "$3}' >WC
|
||||
w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WC
|
||||
if ! diff WB WC >/dev/null 2>&1; then
|
||||
echo -en "\r\033[1;33m$(TEXT "access(ssh/web) status has changed and booting is interrupted.")\033[0m\n"
|
||||
rm -f WB WC
|
||||
@ -286,7 +286,7 @@ else
|
||||
fi
|
||||
kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
|
||||
echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m"
|
||||
for T in $(w -h 2>/dev/null | awk '{print $2}'); do
|
||||
for T in $(w 2>/dev/null | grep -v "TTY" | awk -F' ' '{print $2}'); do
|
||||
[ -w "/dev/${T}" ] && echo -e "\n\033[1;43m$(TEXT "[This interface will not be operational. Please wait a few minutes.\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]")\033[0m\n" >"/dev/${T}" 2>/dev/null || true
|
||||
done
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
RR_VERSION="24.6.3"
|
||||
RR_VERSION="24.6.1"
|
||||
RR_RELEASE=""
|
||||
RR_TITLE="RR v${RR_VERSION}"
|
||||
|
||||
|
||||
@ -222,7 +222,7 @@ if [ "${DSMLOGO}" = "true" -a -c "/dev/fb0" -a ! "LOCALBUILD" = "${LOADER_DISK}"
|
||||
fi
|
||||
|
||||
# Check memory
|
||||
RAM=$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo 2>/dev/null)
|
||||
RAM=$(free -m 2>/dev/null | awk '/Mem:/{print $2}')
|
||||
if [ ${RAM:-0} -le 3500 ]; then
|
||||
echo -e "\033[1;33m$(TEXT "You have less than 4GB of RAM, if errors occur in loader creation, please increase the amount of memory.")\033[0m\n"
|
||||
fi
|
||||
|
||||
@ -1 +1 @@
|
||||
24.6.3
|
||||
24.6.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user