From 5ce02ba109331de813f0360ca300812fc7ea29dd Mon Sep 17 00:00:00 2001 From: Ing Date: Wed, 7 May 2025 14:50:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8C=82=E8=BD=BD=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=EF=BC=8C=E4=BD=BF=E7=94=A8=20blkid=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=87=E4=BB=B6=E7=B3=BB=E7=BB=9F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/initrd/opt/rr/menu.sh | 20 ++++++++++---------- guide.md | 17 +++++++++-------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index 3b35e28f..8307badd 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -1838,7 +1838,7 @@ function allowDSMDowngrade() { mkdir -p "${TMP_PATH}/mdX" for I in ${DSMROOTS}; do fixDSMRootPart "${I}" - mount -t ext4 "${I}" "${TMP_PATH}/mdX" + mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX" [ $? -ne 0 ] && continue rm -f "${TMP_PATH}/mdX/etc/VERSION" "${TMP_PATH}/mdX/etc.defaults/VERSION" sync @@ -1869,7 +1869,7 @@ function resetDSMPassword() { mkdir -p "${TMP_PATH}/mdX" for I in ${DSMROOTS}; do fixDSMRootPart "${I}" - mount -t ext4 "${I}" "${TMP_PATH}/mdX" + mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX" [ $? -ne 0 ] && continue if [ -f "${TMP_PATH}/mdX/etc/shadow" ]; then while read -r L; do @@ -1920,7 +1920,7 @@ function resetDSMPassword() { NEWPASSWD="$(openssl passwd -6 -salt "$(openssl rand -hex 8)" "${STRPASSWD}")" for I in ${DSMROOTS}; do fixDSMRootPart "${I}" - mount -t ext4 "${I}" "${TMP_PATH}/mdX" + mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX" [ $? -ne 0 ] && continue sed -i "s|^${USER}:[^:]*|${USER}:${NEWPASSWD}|" "${TMP_PATH}/mdX/etc/shadow" sed -i "/^${USER}:/ s/^\(${USER}:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\)[^:]*:/\1:/" "${TMP_PATH}/mdX/etc/shadow" @@ -1966,7 +1966,7 @@ function addNewDSMUser() { mkdir -p "${TMP_PATH}/mdX" for I in ${DSMROOTS}; do fixDSMRootPart "${I}" - mount -t ext4 "${I}" "${TMP_PATH}/mdX" + mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX" [ $? -ne 0 ] && continue if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then sqlite3 "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" </dev/null diff --git a/guide.md b/guide.md index 025dee57..eea5ae21 100644 --- a/guide.md +++ b/guide.md @@ -79,7 +79,7 @@ # 解压 并写入到引导盘 # Decompress and write to the boot disk # 获取当前的引导盘 - LOADER_DISK="$(blkid | grep 'LABEL="RR3"' | cut -d3 -f1)" + LOADER_DISK="$(blkid -L RR3 2>/dev/null | cut -d3 -f1)" unzip -p rr.zip | dd of=${LOADER_DISK} bs=1M conv=fsync # 重启 reboot reboot @@ -87,7 +87,7 @@ * RR 备份 (Any version): ```shell # 备份为 disk.img.gz, 自行导出. - dd if="$(blkid | grep 'LABEL="RR3"' | cut -d3 -f1)" | gzip > disk.img.gz + dd if="$(blkid -L RR3 2>/dev/null | cut -d3 -f1)" | gzip > disk.img.gz # 结合 transfer.sh 直接导出链接 curl -skL --insecure -w '\n' --upload-file disk.img.gz https://transfer.sh ``` @@ -247,13 +247,14 @@ mdadm --zero-superblock /dev/sda1 # 清除 sda1 磁盘分区的 RAID 超级块 (使这个磁盘分区不再被识别为 RAID 设备的一部分) # eudev - udevadm control --reload-rules # 重新加载 udev 规则 - udevadm trigger # 触发 udev 事件 - udevadm info --query all --name /dev/sda1 # 查看 udev 属性 + udevadm control --reload-rules # 重新加载 udev 规则 + udevadm trigger # 触发 udev 事件 + udevadm info --query all --name /dev/sata1 # 查看 udev 属性 udevadm info --query all --path /sys/class/net/eth0 # 查看 udev 属性 - udevadm monitor --property --udev # 监控 udev 事件 - udevadm test /dev/sda1 # 测试 udev 规则 - + udevadm info --attribute-walk --name=/dev/sata1 # 列出 udev 属性 + udevadm monitor --property --udev # 监控 udev 事件 + udevadm test /dev/sata1 # 测试 udev 规则 + # 服务相关 journalctl -xe # 查看服务日志 systemctl # 查看服务