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

优化 something

Browse Source
This commit is contained in:
Ing 2025-02-20 17:25:04 +08:00
parent dbbb5bf839
commit 5ddf7eeb48
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/initrd/opt/rr/boot.sh
View File

@ -123,6 +123,7 @@ CMDLINE['netif_num']="0"
} # Sanity check } # Sanity check
[ -n "${MAC1}" ] && CMDLINE['mac1']="${MAC1}" && CMDLINE['netif_num']="1" [ -n "${MAC1}" ] && CMDLINE['mac1']="${MAC1}" && CMDLINE['netif_num']="1"
[ -n "${MAC2}" ] && CMDLINE['mac2']="${MAC2}" && CMDLINE['netif_num']="2" [ -n "${MAC2}" ] && CMDLINE['mac2']="${MAC2}" && CMDLINE['netif_num']="2"
CMDLINE['skip_vender_mac_interfaces']="$(seq -s, 0 $((${CMDLINE['netif_num']:-1} - 1)))"
# set fixed cmdline # set fixed cmdline
if grep -q "force_junior" /proc/cmdline; then if grep -q "force_junior" /proc/cmdline; then
@ -163,7 +164,6 @@ fi
CMDLINE["HddHotplug"]="1" CMDLINE["HddHotplug"]="1"
CMDLINE["vender_format_version"]="2" CMDLINE["vender_format_version"]="2"
CMDLINE['skip_vender_mac_interfaces']="0,1,2,3,4,5,6,7"
CMDLINE['earlyprintk']="" CMDLINE['earlyprintk']=""
CMDLINE['earlycon']="uart8250,io,0x3f8,115200n8" CMDLINE['earlycon']="uart8250,io,0x3f8,115200n8"
CMDLINE['console']="ttyS0,115200n8" CMDLINE['console']="ttyS0,115200n8"

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

@ -3302,8 +3302,7 @@ function downloadExts() {
# TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | pup 'a[class="Link--muted"] attr{href}' | grep ".zip" | head -1)" # TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | pup 'a[class="Link--muted"] attr{href}' | grep ".zip" | head -1)"
TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)" TAG="$(curl -skL --connect-timeout 10 "${PROXY}${3}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)"
else else
LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${PROXY}${3}/releases/latest")" TAG="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${PROXY}${3}/releases/latest" | awk -F'/' '{print $NF}')"
TAG="${LATESTURL##*/}"
fi fi
[ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}" [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}"
if [ "${TAG:-latest}" = "latest" ]; then if [ "${TAG:-latest}" = "latest" ]; then

2
files/initrd/opt/rr/platforms.yml
View File

@ -15,7 +15,7 @@ synoinfo: &synoinfo
support_fan: "no" support_fan: "no"
supportadt7490: "no" supportadt7490: "no"
maxlanport: "8" maxlanport: "8"
netif_seq: "0 1 2 3 4 5 6 7" netif_seq: ""
buzzeroffen: "0xffff" buzzeroffen: "0xffff"
productvers4: &productvers4 productvers4: &productvers4

20
files/mnt/p1/boot/grub/grub.cfg
View File

@ -74,11 +74,6 @@ background_image ${prefix}/logo.png
function gfxmode { function gfxmode {
set gfxpayload="${linux_gfx_mode}" set gfxpayload="${linux_gfx_mode}"
if [ "${linux_gfx_mode}" = "keep" ]; then
set vt_handoff=vt.handoff=7
else
set vt_handoff=
fi
} }
set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset" set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset"
@ -153,7 +148,20 @@ fi
menuentry 'Configure loader' ${menuentry_id_option} config { menuentry 'Configure loader' ${menuentry_id_option} config {
gfxmode gfxmode
echo "Loading kernel..." echo "Loading kernel..."
linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} IWANTTOCHANGETHECONFIG linux /bzImage-rr earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 ${RR_CMDLINE} ${rr_cmdline} IWANTTOCHANGETHECONFIG
echo "Loading initramfs..."
if [ -e /initrd-rru ]; then
initrd /initrd-rr /initrd-rru
else
initrd /initrd-rr
fi
echo "Booting..."
}
menuentry 'Configure loader (verbose)' ${menuentry_id_option} verbose {
gfxmode
echo "Loading kernel..."
linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} earlycon=tty2 console=tty2 IWANTTOCHANGETHECONFIG
echo "Loading initramfs..." echo "Loading initramfs..."
if [ -e /initrd-rru ]; then if [ -e /initrd-rru ]; then
initrd /initrd-rr /initrd-rru initrd /initrd-rr /initrd-rru