yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix typo

Browse Source
This commit is contained in:
Ing 2024-01-13 12:30:22 +08:00
parent 820f0f7a7b
commit 202f374860
3 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/initrd/opt/rr/include/i18n.sh
View File

@ -3,6 +3,7 @@
if [ -d "/usr/share/locale" ]; then if [ -d "/usr/share/locale" ]; then
if [ $(ls ${WORK_PATH}/lang/*.mo 2>/dev/null | wc -l) -gt 0 ]; then if [ $(ls ${WORK_PATH}/lang/*.mo 2>/dev/null | wc -l) -gt 0 ]; then
for F in $(ls ${WORK_PATH}/lang/*.mo); do for F in $(ls ${WORK_PATH}/lang/*.mo); do
mkdir -p "/usr/share/locale/$(basename "${F}" .mo)/LC_MESSAGES"
install "${F}" "/usr/share/locale/$(basename "${F}" .mo)/LC_MESSAGES/rr.mo" install "${F}" "/usr/share/locale/$(basename "${F}" .mo)/LC_MESSAGES/rr.mo"
done done
fi fi

42
files/initrd/opt/rr/menu.sh
View File

@ -583,7 +583,7 @@ function addonMenu() {
mkdir -p ${TMP_UP_PATH} mkdir -p ${TMP_UP_PATH}
pushd ${TMP_UP_PATH} pushd ${TMP_UP_PATH}
rz -be rz -be
for F in $(ls -A); do for F in $(ls -A 2>/dev/null); do
USER_FILE=${F} USER_FILE=${F}
break break
done done
@ -725,7 +725,7 @@ function moduleMenu() {
mkdir -p ${TMP_UP_PATH} mkdir -p ${TMP_UP_PATH}
pushd ${TMP_UP_PATH} pushd ${TMP_UP_PATH}
rz -be rz -be
for F in $(ls -A); do for F in $(ls -A 2>/dev/null); do
USER_FILE=${F} USER_FILE=${F}
break break
done done
@ -1359,7 +1359,7 @@ function advancedMenu() {
MSG="$(TEXT "Temporary IP: (UI will not refresh)")" MSG="$(TEXT "Temporary IP: (UI will not refresh)")"
ITEMS="" ITEMS=""
IDX=0 IDX=0
ETHX=$(ls /sys/class/net/ | grep -v lo) ETHX=$(ls /sys/class/net/ 2>/dev/null | grep -v lo)
for ETH in ${ETHX}; do for ETH in ${ETHX}; do
[ ${IDX} -gt 7 ] && break # Currently, only up to 8 are supported. (<==> boot.sh L96, <==> lkm: MAX_NET_IFACES) [ ${IDX} -gt 7 ] && break # Currently, only up to 8 are supported. (<==> boot.sh L96, <==> lkm: MAX_NET_IFACES)
IDX=$((${IDX} + 1)) IDX=$((${IDX} + 1))
@ -1431,7 +1431,7 @@ function advancedMenu() {
echo " psk=\"${PSK}\"" >>${PART1_PATH}/wpa_supplicant.conf echo " psk=\"${PSK}\"" >>${PART1_PATH}/wpa_supplicant.conf
echo "}" >>${PART1_PATH}/wpa_supplicant.conf echo "}" >>${PART1_PATH}/wpa_supplicant.conf
for ETH in $(ls /sys/class/net/ | grep wlan); do for ETH in $(ls /sys/class/net/ 2>/dev/null | grep wlan); do
connectwlanif "${ETH}" && sleep 1 connectwlanif "${ETH}" && sleep 1
MACR="$(cat /sys/class/net/${ETH}/address | sed 's/://g')" MACR="$(cat /sys/class/net/${ETH}/address | sed 's/://g')"
IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")" IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
@ -1473,7 +1473,7 @@ function advancedMenu() {
for PCI in $(lspci -d ::106 | awk '{print $1}'); do for PCI in $(lspci -d ::106 | awk '{print $1}'); do
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://") NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
MSG+="\Zb${NAME}\Zn\nPorts: " MSG+="\Zb${NAME}\Zn\nPorts: "
PORTS=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n) PORTS=$(ls -l /sys/class/scsi_host 2>/dev/null | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n)
for P in ${PORTS}; do for P in ${PORTS}; do
if lsscsi -b | grep -v - | grep -q "\[${P}:"; then if lsscsi -b | grep -v - | grep -q "\[${P}:"; then
DUMMY="$([ "$(cat /sys/class/scsi_host/host${P}/ahci_port_cmd)" = "0" ] && echo 1 || echo 2)" DUMMY="$([ "$(cat /sys/class/scsi_host/host${P}/ahci_port_cmd)" = "0" ] && echo 1 || echo 2)"
@ -1492,28 +1492,28 @@ function advancedMenu() {
[ $(lspci -d ::104 | wc -l) -gt 0 ] && MSG+="\nRAID:\n" [ $(lspci -d ::104 | wc -l) -gt 0 ] && MSG+="\nRAID:\n"
for PCI in $(lspci -d ::104 | awk '{print $1}'); do for PCI in $(lspci -d ::104 | awk '{print $1}'); do
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://") NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n) PORT=$(ls -l /sys/class/scsi_host 2>/dev/null | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n)
PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l) PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n" MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n"
NUMPORTS=$((${NUMPORTS} + ${PORTNUM})) NUMPORTS=$((${NUMPORTS} + ${PORTNUM}))
done done
[ $(lspci -d ::107 | wc -l) -gt 0 ] && MSG+="\nHBA:\n" [ $(lspci -d ::107 | wc -l) -gt 0 ] && MSG+="\nSerial Attached SCSI:\n"
for PCI in $(lspci -d ::107 | awk '{print $1}'); do for PCI in $(lspci -d ::107 | awk '{print $1}'); do
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://") NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n) PORT=$(ls -l /sys/class/scsi_host 2>/dev/null | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n)
PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l) PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n" MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n"
NUMPORTS=$((${NUMPORTS} + ${PORTNUM})) NUMPORTS=$((${NUMPORTS} + ${PORTNUM}))
done done
[ $(lspci -d ::100 | wc -l) -gt 0 ] && MSG+="\nVIRTIO:\n" [ $(lspci -d ::100 | wc -l) -gt 0 ] && MSG+="\nSCSI:\n"
for PCI in $(lspci -d ::100 | awk '{print $1}'); do for PCI in $(lspci -d ::100 | awk '{print $1}'); do
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://") NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
PORTNUM=$(ls -l /sys/block/vd* | grep "${PCI}" | wc -l) PORTNUM=$(ls -l /sys/block/* 2>/dev/null | grep "${PCI}" | wc -l)
[ ${PORTNUM} -eq 0 ] && continue [ ${PORTNUM} -eq 0 ] && continue
MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n" MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n"
NUMPORTS=$((${NUMPORTS} + ${PORTNUM})) NUMPORTS=$((${NUMPORTS} + ${PORTNUM}))
done done
[ $(ls -l /sys/class/scsi_host | grep usb | wc -l) -gt 0 ] && MSG+="\nUSB:\n" [ $(ls -l /sys/class/scsi_host 2>/dev/null | grep usb | wc -l) -gt 0 ] && MSG+="\nUSB:\n"
for PCI in $(lspci -d ::c03 | awk '{print $1}'); do for PCI in $(lspci -d ::c03 | awk '{print $1}'); do
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://") NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n) PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n)
@ -1522,7 +1522,7 @@ function advancedMenu() {
MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n" MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n"
NUMPORTS=$((${NUMPORTS} + ${PORTNUM})) NUMPORTS=$((${NUMPORTS} + ${PORTNUM}))
done done
[ $(ls -l /sys/class/mmc_host | grep mmc_host | wc -l) -gt 0 ] && MSG+="\nMMC:\n" [ $(ls -l /sys/class/mmc_host 2>/dev/null | grep mmc_host | wc -l) -gt 0 ] && MSG+="\nMMC:\n"
for PCI in $(lspci -d ::805 | awk '{print $1}'); do for PCI in $(lspci -d ::805 | awk '{print $1}'); do
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://") NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
PORTNUM=$(ls -l /sys/block/mmc* | grep "${PCI}" | wc -l) PORTNUM=$(ls -l /sys/block/mmc* | grep "${PCI}" | wc -l)
@ -1533,7 +1533,7 @@ function advancedMenu() {
[ $(lspci -d ::108 | wc -l) -gt 0 ] && MSG+="\nNVME:\n" [ $(lspci -d ::108 | wc -l) -gt 0 ] && MSG+="\nNVME:\n"
for PCI in $(lspci -d ::108 | awk '{print $1}'); do for PCI in $(lspci -d ::108 | awk '{print $1}'); do
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://") NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
PORT=$(ls -l /sys/class/nvme | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/nvme//' | sort -n) PORT=$(ls -l /sys/class/nvme 2>/dev/null | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/nvme//' | sort -n)
PORTNUM=$(lsscsi -b | grep -v - | grep "\[N:${PORT}:" | wc -l) PORTNUM=$(lsscsi -b | grep -v - | grep "\[N:${PORT}:" | wc -l)
MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n" MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n"
NUMPORTS=$((${NUMPORTS} + ${PORTNUM})) NUMPORTS=$((${NUMPORTS} + ${PORTNUM}))
@ -1608,11 +1608,11 @@ function advancedMenu() {
DIALOG --title "$(TEXT "Advanced")" \ DIALOG --title "$(TEXT "Advanced")" \
--yesno "$(TEXT "Warning:\nThis operation is irreversible. Please backup important data. Do you want to continue?")" 0 0 --yesno "$(TEXT "Warning:\nThis operation is irreversible. Please backup important data. Do you want to continue?")" 0 0
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
if [ $(ls /dev/md* | wc -l) -gt 0 ]; then if [ $(ls /dev/md* 2>/dev/null | wc -l) -gt 0 ]; then
DIALOG --title "$(TEXT "Advanced")" \ DIALOG --title "$(TEXT "Advanced")" \
--yesno "$(TEXT "Warning:\nThe current hds is in raid, do you still want to format them?")" 0 0 --yesno "$(TEXT "Warning:\nThe current hds is in raid, do you still want to format them?")" 0 0
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
for I in $(ls /dev/md*); do for I in $(ls /dev/md* 2>/dev/null); do
mdadm -S "${I}" mdadm -S "${I}"
done done
fi fi
@ -1747,7 +1747,7 @@ function advancedMenu() {
mkdir -p "${TMP_UP_PATH}" mkdir -p "${TMP_UP_PATH}"
pushd "${TMP_UP_PATH}" pushd "${TMP_UP_PATH}"
rz -be rz -be
for F in $(ls -A); do for F in $(ls -A 2>/dev/null); do
USER_FILE="${TMP_UP_PATH}/${F}" USER_FILE="${TMP_UP_PATH}/${F}"
dtc -q -I dts -O dtb "${F}" >"test.dtb" dtc -q -I dts -O dtb "${F}" >"test.dtb"
RET=$? RET=$?
@ -2078,7 +2078,7 @@ function boot() {
############################################################################### ###############################################################################
# Shows language to user choose one # Shows language to user choose one
function languageMenu() { function languageMenu() {
ITEMS="$(ls /usr/share/locale)" ITEMS="$(ls /usr/share/locale 2>/dev/null)"
DIALOG \ DIALOG \
--default-item "${LAYOUT}" --no-items --menu "$(TEXT "Choose a language")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp --default-item "${LAYOUT}" --no-items --menu "$(TEXT "Choose a language")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
@ -2092,7 +2092,7 @@ function languageMenu() {
############################################################################### ###############################################################################
# Shows available keymaps to user choose one # Shows available keymaps to user choose one
function keymapMenu() { function keymapMenu() {
OPTIONS="$(ls /usr/share/keymaps/i386 | grep -v include)" OPTIONS="$(ls /usr/share/keymaps/i386 2>/dev/null | grep -v include)"
DIALOG \ DIALOG \
--default-item "${LAYOUT}" --no-items --menu "$(TEXT "Choose a layout")" 0 0 0 ${OPTIONS} \ --default-item "${LAYOUT}" --no-items --menu "$(TEXT "Choose a layout")" 0 0 0 ${OPTIONS} \
2>${TMP_PATH}/resp 2>${TMP_PATH}/resp
@ -2103,7 +2103,7 @@ function keymapMenu() {
OPTIONS+="${KM::-7} " OPTIONS+="${KM::-7} "
done < <( done < <(
cd /usr/share/keymaps/i386/${LAYOUT} cd /usr/share/keymaps/i386/${LAYOUT}
ls *.map.gz ls *.map.gz 2>/dev/null
) )
DIALOG \ DIALOG \
--default-item "${KEYMAP}" --no-items --menu "$(TEXT "Choice a keymap")" 0 0 0 ${OPTIONS} \ --default-item "${KEYMAP}" --no-items --menu "$(TEXT "Choice a keymap")" 0 0 0 ${OPTIONS} \
@ -2240,7 +2240,7 @@ function updateExts() {
--infobox "$(printf "$(TEXT "Installing new %s ...")" "${1}")" 0 0 --infobox "$(printf "$(TEXT "Installing new %s ...")" "${1}")" 0 0
rm -Rf "${ADDONS_PATH}/"* rm -Rf "${ADDONS_PATH}/"*
[ -f "${TMP_PATH}/addons/VERSION" ] && cp -f "${TMP_PATH}/addons/VERSION" "${ADDONS_PATH}/" [ -f "${TMP_PATH}/addons/VERSION" ] && cp -f "${TMP_PATH}/addons/VERSION" "${ADDONS_PATH}/"
for PKG in $(ls ${TMP_PATH}/addons/*.addon); do for PKG in $(ls ${TMP_PATH}/addons/*.addon 2>/dev/null); do
ADDON=$(basename ${PKG} | sed 's|.addon||') ADDON=$(basename ${PKG} | sed 's|.addon||')
rm -rf "${ADDONS_PATH}/${ADDON}" rm -rf "${ADDONS_PATH}/${ADDON}"
mkdir -p "${ADDONS_PATH}/${ADDON}" mkdir -p "${ADDONS_PATH}/${ADDON}"
@ -2373,7 +2373,7 @@ function updateMenu() {
mkdir -p "${TMP_UP_PATH}" mkdir -p "${TMP_UP_PATH}"
pushd "${TMP_UP_PATH}" pushd "${TMP_UP_PATH}"
rz -be rz -be
for F in $(ls -A); do for F in $(ls -A 2>/dev/null); do
for I in ${EXTS[@]}; do for I in ${EXTS[@]}; do
[[ "${F}" = ${I} ]] && USER_FILE="${F}" [[ "${F}" = ${I} ]] && USER_FILE="${F}"
done done

22
guide.md
View File

@ -131,13 +131,16 @@
# 磁盘相关 # 磁盘相关
fdisk -l # 查看硬盘信息 fdisk -l # 查看硬盘信息
lspci -d ::106 # 查看 ATA 控制器 lspci -d ::100 # 查看 SCSI 存储控制器 https://admin.pci-ids.ucw.cz/read/PD/
lspci -d ::104 # 查看 RAID 控制器 lspci -d ::101 # 查看 IDE 接口
lspci -d ::107 # 查看 HBA 控制器 lspci -d ::102 # 查看 软盘 磁盘控制器
lspci -d ::108 # 查看 NVME 控制器 lspci -d ::103 # 查看 IPI 总线控制器
lspci -d ::c03 # 查看 USB 控制器 lspci -d ::104 # 查看 RAID 总线控制器
lspci -d ::805 # 查看 MMC 控制器 lspci -d ::105 # 查看 ATA 总线控制器
lspci -d ::100 # 查看 VIRTIO 控制器 lspci -d ::106 # 查看 SATA 总线控制器
lspci -d ::107 # 查看 串行 Attached SCSI
lspci -d ::108 # 查看 NVM 控制器
ls -l /sys/class/scsi_host # 查看 ATA 硬盘 host 信息 ls -l /sys/class/scsi_host # 查看 ATA 硬盘 host 信息
ls -l /sys/class/mmc_host # 查看 MMC 硬盘 host 信息 ls -l /sys/class/mmc_host # 查看 MMC 硬盘 host 信息
ls -l /sys/class/nvme # 查看 NVME 硬盘 host 信息 ls -l /sys/class/nvme # 查看 NVME 硬盘 host 信息
@ -172,6 +175,11 @@
cat /var/log/messages # 引导态下操作日志 cat /var/log/messages # 引导态下操作日志
cat /tmp/installer_sh.log # 安装日志 (junior mode) cat /tmp/installer_sh.log # 安装日志 (junior mode)
# 显卡相关
lspci -d ::300 # 查看 VGA 兼容控制器
lspci -d ::301 # 查看 XGA 控制器
lspci -d ::302 # 查看 3D 控制器（不是 VGA 兼容）
# Intel GPU # Intel GPU
lspci -nd ::300 | cut -d " " -f 3 # PIDVID lspci -nd ::300 | cut -d " " -f 3 # PIDVID
ls /dev/dri # 查看显卡设备 ls /dev/dri # 查看显卡设备