Compare commits

...

13 Commits
25.8.0 ... main

Author SHA1 Message Date
Ing
9c11315756 修复菜单脚本中的域名顺序以确保正确解析 2025-09-04 13:15:29 +08:00
github-actions[bot]
f2a34edeff update 2025-09-02 18:22:21 2025-09-02 18:22:21 +08:00
github-actions[bot]
3320be7a16 update 2025-09-02 17:43:25 2025-09-02 17:43:25 +08:00
Ing
efd1d3d291 优化 curl 命令,强制使用 HTTP/1.1 以提高兼容性 2025-08-27 11:36:14 +08:00
Ing
bd5e688f7e Refactor code structure for improved readability and maintainability 2025-08-22 21:25:38 +08:00
Ing
f90478e426 修复输出值的转义问题 2025-08-22 09:10:09 +08:00
github-actions[bot]
ac588eff6c update 2025-08-22 16:24:07 2025-08-22 16:24:07 +08:00
github-actions[bot]
6618efbe45 update 2025-08-22 15:49:38 2025-08-22 15:49:38 +08:00
Ing
506451071d 添加 Tips 功能,更新相关文件以支持提示信息的显示和存储 2025-08-22 10:45:26 +08:00
Ing
84d7425912 添加 GPT 和 LVM 模块以支持分区和逻辑卷管理 2025-08-22 10:44:57 +08:00
github-actions[bot]
6f1b3fc9e3 update 2025-08-22 10:27:35 2025-08-22 10:27:35 +08:00
Ing
5c9d6a4eae 优化样式,调整元素对齐和间距,更新产品和标签展示 2025-08-05 17:28:40 +08:00
github-actions[bot]
58fe6a7b13 update 2025-08-04 19:48:36 2025-08-04 19:48:36 +08:00
32 changed files with 4197 additions and 4059 deletions

View File

@ -29,7 +29,9 @@ jobs:
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import json, subprocess import json, subprocess
def set_output(name, value): def set_output(name, value):
subprocess.call(["echo '{}={}' >> $GITHUB_ENV".format(name, value)], shell=True) subprocess.call(f'echo "{name}<<EOF" >> $GITHUB_ENV', shell=True)
subprocess.call(f'echo "{value}" >> $GITHUB_ENV', shell=True)
subprocess.call(f'echo "EOF" >> $GITHUB_ENV', shell=True)
issuetitle = ${{ toJSON(github.event.issue.title) }} issuetitle = ${{ toJSON(github.event.issue.title) }}
issuebody = ${{ toJSON(github.event.issue.body) }} issuebody = ${{ toJSON(github.event.issue.body) }}
@ -43,6 +45,7 @@ jobs:
language= '' language= ''
sn = '' sn = ''
macs = '' macs = ''
tips = ''
model = '' model = ''
version = '' version = ''
kernel = '' kernel = ''
@ -58,6 +61,7 @@ jobs:
language = jsonbody.get('language', '') language = jsonbody.get('language', '')
sn = jsonbody.get('sn', '') sn = jsonbody.get('sn', '')
macs = jsonbody.get('macs', '') macs = jsonbody.get('macs', '')
tips = jsonbody.get('tips', '')
model = jsonbody.get('model', '') model = jsonbody.get('model', '')
version = jsonbody.get('version', '') version = jsonbody.get('version', '')
kernel = jsonbody.get('kernel', '') kernel = jsonbody.get('kernel', '')
@ -79,6 +83,7 @@ jobs:
set_output("language", language) set_output("language", language)
set_output("sn", sn) set_output("sn", sn)
set_output("macs", macs) set_output("macs", macs)
set_output("tips", tips)
set_output("model", model) set_output("model", model)
set_output("version", version) set_output("version", version)
set_output("kernel", kernel) set_output("kernel", kernel)
@ -223,6 +228,8 @@ jobs:
# sudo sed -i "s/set -e/set -ex/" rr/ws/initrd/opt/rr/init.sh # sudo sed -i "s/set -e/set -ex/" rr/ws/initrd/opt/rr/init.sh
# sudo sed -i '/^alias/i\set -x' rr/ws/initrd/opt/rr/menu.sh # sudo sed -i '/^alias/i\set -x' rr/ws/initrd/opt/rr/menu.sh
sudo sed -i 's/"global.synologydownload.com" "global.download.synology.com"/"global.download.synology.com" "global.synologydownload.com"/g' rr/ws/initrd/opt/rr/menu.sh
[ -n "${{ env.language }}" ] && echo "${{ env.language }}.UTF-8" | sudo tee rr/ws/mnt/p1/.locale [ -n "${{ env.language }}" ] && echo "${{ env.language }}.UTF-8" | sudo tee rr/ws/mnt/p1/.locale
sudo ./localbuild.sh init sudo ./localbuild.sh init
@ -248,7 +255,7 @@ jobs:
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
writeConfigKey "sn" "${{ env.sn }}" "${USER_CONFIG_FILE}" writeConfigKey "sn" "${{ env.sn }}" "${USER_CONFIG_FILE}"
fi fi
if [ -n "${{ env.macs }}" ]; then if [ -n "${{ env.macs }}" ]; then
echo "set macs: ${{ env.macs }}" echo "set macs: ${{ env.macs }}"
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
@ -257,6 +264,11 @@ jobs:
writeConfigKey "mac2" "${MACS[1]}" "${USER_CONFIG_FILE}" writeConfigKey "mac2" "${MACS[1]}" "${USER_CONFIG_FILE}"
fi fi
if [ -n "${{ env.tips }}" ]; then
echo "set tips: ${{ env.tips }}"
echo -e "${{ env.tips }}" | sudo tee rr/ws/mnt/p3/AddTips
fi
if [ -n "${{ env.addons }}" ]; then if [ -n "${{ env.addons }}" ]; then
echo "set addons: ${{ env.addons }}" echo "set addons: ${{ env.addons }}"
USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
@ -415,14 +427,6 @@ jobs:
---- ----
emoji: hooray emoji: hooray
- name: Close Issues
if: env.iscustom == 'true' && success()
uses: actions-cool/issues-helper@v3
with:
actions: 'close-issue'
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
- name: Update Comment Fail - name: Update Comment Fail
if: env.iscustom == 'true' && failure() if: env.iscustom == 'true' && failure()
uses: actions-cool/issues-helper@v3 uses: actions-cool/issues-helper@v3
@ -437,3 +441,11 @@ jobs:
> ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
---- ----
emoji: confused emoji: confused
- name: Close Issues
if: env.iscustom == 'true'
uses: actions-cool/issues-helper@v3
with:
actions: 'close-issue'
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}

View File

@ -1 +1 @@
25.8.0 25.9.1

Binary file not shown.

View File

@ -29,6 +29,23 @@
.textarea-style { .textarea-style {
width: 100%; width: 100%;
} }
#logo {
text-align: center;
margin: 20px auto !important;
}
#labels {
text-align: center;
margin: 20px auto !important;
height: auto !important;
}
#products {
text-align: center;
margin: 20px auto !important;
height: auto !important;
}
</style> </style>
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="https://polyfill.io/v3/polyfill.min.js"></script> <script src="https://polyfill.io/v3/polyfill.min.js"></script>
@ -90,9 +107,11 @@
if (debug) { if (debug) {
$('#sn_item').show(); $('#sn_item').show();
$('#macs_item').show(); $('#macs_item').show();
$('#tips_item').show();
} else { } else {
$('#sn_item').hide(); $('#sn_item').hide();
$('#macs_item').hide(); $('#macs_item').hide();
$('#tips_item').hide();
} }
setModels(); setModels();
}); });
@ -262,7 +281,7 @@
var body = {}; var body = {};
var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"]; var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"];
if (debug) { if (debug) {
_parameters.push("sn", "macs"); _parameters.push("sn", "macs", "tips");
} }
for (var key in _parameters) { for (var key in _parameters) {
var name = _parameters[key]; var name = _parameters[key];
@ -309,28 +328,21 @@
╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚══════╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚══════╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝
</pre> </pre>
<div class="image" id="products" style="height: 50px; margin-left: 200px;"> <div class="shields" id="labels">
<img src="https://www.synology.cn/img/products/detail/SA6400/heading.png" width="20%"> <a id="titleA" href="https://github.com/RROrg/rr">
<img alt="GitHub Release"
src="https://img.shields.io/github/v/release/rrorg/rr?include_prereleases&style=flat-square&label=current">
</a>
<a id="titleA" href="https://github.com/RROrg/rr">
<img alt="GitHub Issues"
src="https://img.shields.io/github/issues-closed-raw/rrorg/rr/custom?style=flat-square&label=custom">
</a>
<a id="titleB" href="./changelogs.html">
<img alt="GitHub Release" src="https://img.shields.io/badge/Changelogs-8A2BE2&style=flat">
</a>
</div> </div>
<div class="flex-auto min-width-0 width-fit mr-3"> <div class="image" id="products">
<div class="d-flex flex-wrap flex-items-center wb-break-word f3 text-normal"> <img src="https://www.synology.cn/img/products/detail/SA6400/heading.png" width="20%">
<a id="titleA" href="https://github.com/RROrg/rr">
<img alt="GitHub Release"
src="https://img.shields.io/github/v/release/rrorg/rr?include_prereleases&style=flat-square&label=current">
<img alt="GitHub Issues"
src="https://img.shields.io/github/issues-closed-raw/rrorg/rr/custom?style=flat-square&label=custom">
</a>
</div>
<div class="d-flex flex-wrap flex-items-center wb-break-word f3 text-normal">
<a id="titleB" href="./changelogs.html">
<img alt="GitHub Release" src="https://img.shields.io/badge/Changelogs-8A2BE2&style=flat">
</a>
</div>
<div class="btn-link tabnav-tab preview-tab js-preview-tab flex-1 flex-md-auto width-full">
<marquee id="content" direction="up" height="36" scrollamount="1" onMouseOut="this.start()"
onMouseOver="this.stop()">
</marquee>
</div>
</div> </div>
<div class="form-group mt-1 mb-2" id="title_item"> <div class="form-group mt-1 mb-2" id="title_item">
<div class="form-group-header"> <div class="form-group-header">
@ -422,6 +434,14 @@
<input class="form-control input-contrast input-sm" type="text" id="macs" name="inputs[macs]" value=""></input> <input class="form-control input-contrast input-sm" type="text" id="macs" name="inputs[macs]" value=""></input>
</div> </div>
</div> </div>
<div class="form-group mt-1 mb-2" id="tips_item">
<div class="form-group-header">
<label class="color-fg-default text-mono f6">Tips:</label>
</div>
<div class="form-group-body">
<input class="form-control input-contrast input-sm" type="text" id="tips" name="inputs[tips]" value=""></input>
</div>
</div>
<div class="form-group mt-1 mb-2" id="model_item"> <div class="form-group mt-1 mb-2" id="model_item">
<div class="form-group-header"> <div class="form-group-header">
<label class="color-fg-default text-mono f6">Model:</label> <label class="color-fg-default text-mono f6">Model:</label>

Binary file not shown.

View File

@ -13520,6 +13520,10 @@
"description": "DME1737 sensors", "description": "DME1737 sensors",
"depends": "hwmon-vid" "depends": "hwmon-vid"
}, },
"drivetemp": {
"description": "Hard drive temperature monitor (Compiled by RR for DSM)",
"depends": ""
},
"drm": { "drm": {
"description": "DRM shared core routines", "description": "DRM shared core routines",
"depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks" "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"
@ -15166,6 +15170,10 @@
"description": "DME1737 sensors", "description": "DME1737 sensors",
"depends": "hwmon-vid" "depends": "hwmon-vid"
}, },
"drivetemp": {
"description": "Hard drive temperature monitor (Compiled by RR for DSM)",
"depends": ""
},
"drm": { "drm": {
"description": "DRM shared core routines", "description": "DRM shared core routines",
"depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks" "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"
@ -19125,6 +19133,10 @@
"description": "DME1737 sensors", "description": "DME1737 sensors",
"depends": "hwmon-vid" "depends": "hwmon-vid"
}, },
"drivetemp": {
"description": "Hard drive temperature monitor (Compiled by RR for DSM)",
"depends": ""
},
"drm": { "drm": {
"description": "DRM panel infrastructure", "description": "DRM panel infrastructure",
"depends": "dmabuf,drm_panel_orientation_quirks" "depends": "dmabuf,drm_panel_orientation_quirks"
@ -25155,6 +25167,10 @@
"description": "DME1737 sensors", "description": "DME1737 sensors",
"depends": "hwmon-vid" "depends": "hwmon-vid"
}, },
"drivetemp": {
"description": "Hard drive temperature monitor (Compiled by RR for DSM)",
"depends": ""
},
"drm": { "drm": {
"description": "DRM shared core routines", "description": "DRM shared core routines",
"depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks" "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"
@ -29061,6 +29077,10 @@
"description": "DME1737 sensors", "description": "DME1737 sensors",
"depends": "hwmon-vid" "depends": "hwmon-vid"
}, },
"drivetemp": {
"description": "Hard drive temperature monitor (Compiled by RR for DSM)",
"depends": ""
},
"drm": { "drm": {
"description": "DRM shared core routines", "description": "DRM shared core routines",
"depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks" "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"

Binary file not shown.

View File

@ -1,4 +1,40 @@
{ {
"DS1525+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1525%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS1825+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1825%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS225+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS225%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS425+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS425%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS725+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS725%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS925+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS925%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"HD6500": { "HD6500": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_HD6500_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_HD6500_72806.pat",
@ -17,6 +53,12 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"RS2825RP+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS2825RP%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS1019+": { "DS1019+": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1019%2B_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1019%2B_72806.pat",
@ -87,12 +129,6 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"DS1525+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1525%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS1621+": { "DS1621+": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1621%2B_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1621%2B_72806.pat",
@ -215,12 +251,6 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"DS1825+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1825%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS220+": { "DS220+": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS220%2B_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS220%2B_72806.pat",
@ -257,12 +287,6 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"DS225+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS225%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS2419+": { "DS2419+": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS2419%2B_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS2419%2B_72806.pat",
@ -411,12 +435,6 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"DS425+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS425%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS620slim": { "DS620slim": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS620slim_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS620slim_72806.pat",
@ -487,12 +505,6 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"DS725+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS725%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DS920+": { "DS920+": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS920%2B_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS920%2B_72806.pat",
@ -537,12 +549,6 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"DS925+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS925%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"DVA1622": { "DVA1622": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DVA1622_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DVA1622_72806.pat",
@ -587,58 +593,8 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"DVA3221": { "DVA3221": {},
"7.2.2-72806-0": { "FS2500": {},
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DVA3221_72806.pat",
"sum": "00000000000000000000000000000000"
},
"7.0.1-42218-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat",
"sum": "00000000000000000000000000000000"
},
"7.2.1-69057-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DVA3221_69057.pat",
"sum": "00000000000000000000000000000000"
},
"7.2.0-64570-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3221_64570.pat",
"sum": "00000000000000000000000000000000"
},
"7.1.1-42962-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3221_42962.pat",
"sum": "00000000000000000000000000000000"
},
"7.1.0-42661-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3221_42661.pat",
"sum": "00000000000000000000000000000000"
}
},
"FS2500": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_FS2500_72806.pat",
"sum": "00000000000000000000000000000000"
},
"7.2.1-69057-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_FS2500_69057.pat",
"sum": "00000000000000000000000000000000"
},
"7.2.0-64570-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS2500_64570.pat",
"sum": "00000000000000000000000000000000"
},
"7.1.1-42962-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS2500_42962.pat",
"sum": "00000000000000000000000000000000"
},
"7.1.0-42661-1": {
"url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat",
"sum": "00000000000000000000000000000000"
},
"7.0.1-42218-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat",
"sum": "00000000000000000000000000000000"
}
},
"FS3400": { "FS3400": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_FS3400_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_FS3400_72806.pat",
@ -927,12 +883,6 @@
"sum": "00000000000000000000000000000000" "sum": "00000000000000000000000000000000"
} }
}, },
"RS2825RP+": {
"7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS2825RP%2B_72806.pat",
"sum": "00000000000000000000000000000000"
}
},
"RS3618xs": { "RS3618xs": {
"7.2.2-72806-0": { "7.2.2-72806-0": {
"url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS3618xs_72806.pat", "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS3618xs_72806.pat",

Binary file not shown.

View File

@ -433,6 +433,7 @@ else
_bootwait || exit 0 _bootwait || exit 0
[ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
printf "\033[1;37m%s\033[0m\n" "$(TEXT "Loading DSM kernel ...")" printf "\033[1;37m%s\033[0m\n" "$(TEXT "Loading DSM kernel ...")"
DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")" DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")"

Binary file not shown.

View File

@ -8,7 +8,7 @@
# shellcheck disable=SC2034 # shellcheck disable=SC2034
RR_VERSION="25.8.0" RR_VERSION="25.9.1"
RR_RELEASE="" RR_RELEASE=""
RR_TITLE="RR v${RR_VERSION}" RR_TITLE="RR v${RR_VERSION}"
@ -38,6 +38,7 @@ RR_RAMUSER_FILE="${PART3_PATH}/initrd-rru"
MC_RAMDISK_FILE="${PART3_PATH}/microcode.img" MC_RAMDISK_FILE="${PART3_PATH}/microcode.img"
MOD_ZIMAGE_FILE="${PART3_PATH}/zImage-dsm" MOD_ZIMAGE_FILE="${PART3_PATH}/zImage-dsm"
MOD_RDGZ_FILE="${PART3_PATH}/initrd-dsm" MOD_RDGZ_FILE="${PART3_PATH}/initrd-dsm"
ADD_TIPS_FILE="${PART3_PATH}/AddTips"
CKS_PATH="${PART3_PATH}/cks" CKS_PATH="${PART3_PATH}/cks"
LKMS_PATH="${PART3_PATH}/lkms" LKMS_PATH="${PART3_PATH}/lkms"

View File

@ -132,13 +132,14 @@ BUSLIST="usb sata sas scsi nvme mmc ide virtio vmbus xen"
if [ "${BUS}" = "usb" ]; then if [ "${BUS}" = "usb" ]; then
VID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_VENDOR_ID" | cut -d= -f2)" VID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_VENDOR_ID" | cut -d= -f2)"
PID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_MODEL_ID" | cut -d= -f2)" PID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_MODEL_ID" | cut -d= -f2)"
[ "${VID}" = "0x" ] || [ "${PID}" = "0x" ] && die "$(TEXT "The loader disk does not support the current USB Portable Hard Disk.")"
TYPE="flashdisk" TYPE="flashdisk"
elif ! echo "${BUSLIST}" | grep -wq "${BUS}"; then elif ! echo "${BUSLIST}" | grep -wq "${BUS}"; then
if [ "LOCALBUILD" = "${LOADER_DISK}" ]; then if [ "LOCALBUILD" = "${LOADER_DISK}" ]; then
echo "LOCALBUILD MODE" echo "LOCALBUILD MODE"
TYPE="PC" TYPE="PC"
else else
die "$(printf "$(TEXT "The boot disk does not support the current %s, only %s DoM is supported.")" "${BUS}" "${BUSLIST// /\/}")" die "$(printf "$(TEXT "The loader disk does not support the current %s, only %s DoM is supported.")" "${BUS}" "${BUSLIST// /\/}")"
fi fi
fi fi
@ -239,6 +240,7 @@ printf "\n"
printf "$(TEXT "Call \033[1;32minit.sh\033[0m to re get init info\n")" printf "$(TEXT "Call \033[1;32minit.sh\033[0m to re get init info\n")"
printf "$(TEXT "Call \033[1;32mmenu.sh\033[0m to configure loader\n")" printf "$(TEXT "Call \033[1;32mmenu.sh\033[0m to configure loader\n")"
printf "\n" printf "\n"
[ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
printf "$(TEXT "User config is on \033[1;32m%s\033[0m\n")" "${USER_CONFIG_FILE}" printf "$(TEXT "User config is on \033[1;32m%s\033[0m\n")" "${USER_CONFIG_FILE}"
printf "$(TEXT "HTTP: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${HTTP:-7080}" printf "$(TEXT "HTTP: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${HTTP:-7080}"
printf "$(TEXT "DUFS: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${DUFS:-7304}" printf "$(TEXT "DUFS: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${DUFS:-7304}"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1240,7 +1240,7 @@ function getSynoExtractor() {
echo "$(TEXT "Downloading old pat to extract synology .pat extractor...")" echo "$(TEXT "Downloading old pat to extract synology .pat extractor...")"
rm -f "${OLDPAT_PATH}" rm -f "${OLDPAT_PATH}"
STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${OLDPAT_URL}" -o "${OLDPAT_PATH}") STATUS=$(curl -kL --http1.1 --connect-timeout 10 -w "%{http_code}" "${OLDPAT_URL}" -o "${OLDPAT_PATH}")
RET=$? RET=$?
if [ ${RET} -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then if [ ${RET} -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then
rm -f "${OLDPAT_PATH}" rm -f "${OLDPAT_PATH}"
@ -1382,13 +1382,13 @@ function extractDsmFiles() {
# Check disk space left # Check disk space left
SPACELEFT=$(df --block-size=1 "${PART3_PATH}" 2>/dev/null | awk 'NR==2 {print $4}') SPACELEFT=$(df --block-size=1 "${PART3_PATH}" 2>/dev/null | awk 'NR==2 {print $4}')
# Discover remote file size # Discover remote file size
FILESIZE=$(curl -skLI --connect-timeout 10 "${PATURL}" | grep -i Content-Length | tail -n 1 | tr -d '\r\n' | awk '{print $2}') FILESIZE=$(curl -skLI --http1.1 --connect-timeout 10 "${PATURL}" | grep -i Content-Length | tail -n 1 | tr -d '\r\n' | awk '{print $2}')
if [ ${FILESIZE:-0} -ge ${SPACELEFT:-0} ]; then if [ ${FILESIZE:-0} -ge ${SPACELEFT:-0} ]; then
# No disk space to download, change it to RAMDISK # No disk space to download, change it to RAMDISK
PAT_PATH="${TMP_PATH}/${PAT_FILE}" PAT_PATH="${TMP_PATH}/${PAT_FILE}"
fi fi
touch "${PAT_PATH}.downloading" touch "${PAT_PATH}.downloading"
STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${PATURL}" -o "${PAT_PATH}") STATUS=$(curl -kL --http1.1 --connect-timeout 10 -w "%{http_code}" "${PATURL}" -o "${PAT_PATH}")
RET=$? RET=$?
rm -f "${PAT_PATH}.downloading" rm -f "${PAT_PATH}.downloading"
if [ ${RET} -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then if [ ${RET} -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then

View File

@ -1 +1 @@
25.8.0 25.9.1

View File

@ -75,7 +75,9 @@ background_image ${prefix}/logo.png
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 nowatchdog" 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 nowatchdog"
search --set=root --label "RR3" insmod part_gpt
insmod lvm
search --set=root --label "RR3" --no-floppy
if [ -e /initrd-rru ]; then set RRU=/initrd-rru; fi if [ -e /initrd-rru ]; then set RRU=/initrd-rru; fi
if [ -e /microcode.img ]; then set MCI=/microcode.img; fi if [ -e /microcode.img ]; then set MCI=/microcode.img; fi