mirror of
https://github.com/RROrg/rr.git
synced 2025-08-21 20:17:11 +08:00
Compare commits
No commits in common. "4ae36d99c38ee8ce8c732dca5ba3d0f055c38ae5" and "98b2d28cc60c61cc91f60d0fe1f254ec55803a2b" have entirely different histories.
4ae36d99c3
...
98b2d28cc6
@ -1,4 +1,4 @@
|
|||||||
RR_VERSION="24.4.1"
|
RR_VERSION="24.4.0"
|
||||||
RR_TITLE="RR v${RR_VERSION}"
|
RR_TITLE="RR v${RR_VERSION}"
|
||||||
|
|
||||||
# Define paths
|
# Define paths
|
||||||
|
@ -1678,13 +1678,13 @@ function showDisksInfo() {
|
|||||||
# Format disk
|
# Format disk
|
||||||
function formatDisks() {
|
function formatDisks() {
|
||||||
rm -f "${TMP_PATH}/opts"
|
rm -f "${TMP_PATH}/opts"
|
||||||
while read KNAME ID PKNAME; do
|
while read KNAME ID; do
|
||||||
[ -z "${KNAME}" ] && continue
|
[ -z "${KNAME}" ] && continue
|
||||||
[[ "${KNAME}" = /dev/md* ]] && continue
|
[[ "${KNAME}" = /dev/md* ]] && continue
|
||||||
[ "${KNAME}" = "${LOADER_DISK}" -o "${PKNAME}" = "${LOADER_DISK}" ] && continue
|
echo "${KNAME}" | grep -q "${LOADER_DISK}" && continue
|
||||||
[ -z "${ID}" ] && ID="Unknown"
|
[ -z "${ID}" ] && ID="Unknown"
|
||||||
echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
|
echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
|
||||||
done <<<$(lsblk -pno KNAME,ID,PKNAME)
|
done <<<$(lsblk -pno KNAME,ID)
|
||||||
if [ ! -f "${TMP_PATH}/opts" ]; then
|
if [ ! -f "${TMP_PATH}/opts" ]; then
|
||||||
DIALOG --title "$(TEXT "Advanced")" \
|
DIALOG --title "$(TEXT "Advanced")" \
|
||||||
--msgbox "$(TEXT "No disk found!")" 0 0
|
--msgbox "$(TEXT "No disk found!")" 0 0
|
||||||
@ -2100,11 +2100,11 @@ function removeBlockIPDB {
|
|||||||
# Clone bootloader disk
|
# Clone bootloader disk
|
||||||
function cloneBootloaderDisk() {
|
function cloneBootloaderDisk() {
|
||||||
rm -f "${TMP_PATH}/opts"
|
rm -f "${TMP_PATH}/opts"
|
||||||
while read KNAME ID PKNAME; do
|
while read KNAME ID; do
|
||||||
[ -z "${KNAME}" -o -z "${ID}" ] && continue
|
[ -z "${KNAME}" -o -z "${ID}" ] && continue
|
||||||
[ "${KNAME}" = "${LOADER_DISK}" -o "${PKNAME}" = "${LOADER_DISK}" ] && continue
|
echo "${KNAME}" | grep -q "${LOADER_DISK}" && continue
|
||||||
echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
|
echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
|
||||||
done <<<$(lsblk -dpno KNAME,ID,PKNAME)
|
done <<<$(lsblk -dpno KNAME,ID)
|
||||||
if [ ! -f "${TMP_PATH}/opts" ]; then
|
if [ ! -f "${TMP_PATH}/opts" ]; then
|
||||||
DIALOG --title "$(TEXT "Advanced")" \
|
DIALOG --title "$(TEXT "Advanced")" \
|
||||||
--msgbox "$(TEXT "No disk found!")" 0 0
|
--msgbox "$(TEXT "No disk found!")" 0 0
|
||||||
|
@ -1 +1 @@
|
|||||||
24.4.1
|
24.4.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user