fix virtio boot

This commit is contained in:
Ing 2024-08-08 11:31:03 +08:00
parent 68993001e3
commit e479542dbb
19 changed files with 52 additions and 65 deletions

View File

@ -76,7 +76,7 @@ if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
HASATA=0
for D in $(lsblk -dpno NAME); do
[ "${D}" = "${LOADER_DISK}" ] && continue
if [ "$(getBus "${D}")" = "sata" -o "$(getBus "${D}")" = "scsi" ]; then
if echo "sata sas scsi" | grep -qw "$(getBus "${D}")"; then
HASATA=1
break
fi

View File

@ -268,8 +268,8 @@ function _sort_netif() {
# 1 - device path
function getBus() {
local BUS=""
# usb/ata(ide)/sata/sas/virtio/mmc/nvme
[ -z "${BUS}" ] && BUS=$(lsblk -dpno KNAME,TRAN 2>/dev/null | grep "${1} " | awk '{print $2}' | sed 's/^ata$/ide/') #Spaces are intentional
# usb/ata(ide)/sata/sas/spi(scsi)/virtio/mmc/nvme
[ -z "${BUS}" ] && BUS=$(lsblk -dpno KNAME,TRAN 2>/dev/null | grep "${1} " | awk '{print $2}' | sed 's/^ata$/ide/' | sed 's/^spi$/scsi/') #Spaces are intentional
# usb/scsi(ide/sata/sas)/virtio/mmc/nvme/vmbus/xen(xvd)
[ -z "${BUS}" ] && BUS=$(lsblk -dpno KNAME,SUBSYSTEMS 2>/dev/null | grep "${1} " | awk '{print $2}' | awk -F':' '{print $(NF-1)}' | sed 's/_host//' | sed 's/^.*xen.*$/xen/') # Spaces are intentional
[ -z "${BUS}" ] && BUS="unknown"

View File

@ -111,7 +111,7 @@ PID="0x0001"
TYPE="DoM"
BUS=$(getBus "${LOADER_DISK}")
BUSLIST="usb sata scsi nvme mmc ide vmbus xen"
BUSLIST="usb sata sas scsi nvme mmc ide virtio vmbus xen"
if [ "${BUS}" = "usb" ]; then
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)"
@ -121,7 +121,7 @@ elif ! echo "${BUSLIST}" | grep -wq "${BUS}"; then
echo "LOCALBUILD MODE"
TYPE="PC"
else
die "$(TEXT "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM")"
die "$(printf "$(TEXT "The boot disk does not support the current %s, only %s DoM is supported.")" "${BUS}" "${BUSLIST// /\/}")"
fi
fi

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 22:13+0800\n"
"Last-Translator: Ing <AI>\n"
"Language-Team: Arabic (Saudi Arabia) <i18n-zh@RROrg>\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "لا يوجد أجهزة شبكة! يرجى إعادة تشغيل init.sh بعد الإتصال بالشبكة!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "ديس التحميل ليس USB أو SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "ديس التحميل لا يدعم %s الحالي، يتم دعم فقط %s DoM."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 21:39+0800\n"
"Last-Translator: Tim Krämer\n"
"Language-Team: German <https://hosted.weblate.org/projects/rrorg/rr/de/>\n"
@ -155,9 +155,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "Netzwerkgeräte nicht gefunden! Bitte führen Sie init.sh erneut aus, nachdem Sie eine Verbindung zum Netzwerk hergestellt haben!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "Ladedisk ist weder USB noch SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "Boot-Disk unterstützt die aktuelle %s nicht, nur %s DoM wird unterstützt."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-01-19 14:25+0800\n"
"Last-Translator: Ing <wjz304>\n"
"Language-Team: English (United States) <i18n-zh@RROrg>\n"
@ -154,7 +154,7 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr ""
#: init.sh:124
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr ""
#: init.sh:133

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 21:42+0800\n"
"Last-Translator: Ing <AI>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/rrorg/rr/es/>\n"
@ -155,9 +155,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "Dispositivos de red no encontrados! Por favor, vuelva a ejecutar init.sh después de conectarse a la red!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "Disco de carga no USB o SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "El disco de arranque no admite la versión actual %s, solo se admite %s DoM."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 21:47+0800\n"
"Last-Translator: Ing <AI>\n"
"Language-Team: French <https://hosted.weblate.org/projects/rrorg/rr/fr/>\n"
@ -155,9 +155,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "Appareils réseau non trouvés! S'il vous plaît réexécuter init.sh après avoir connecté au réseau!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "Disque de charge ni USB ni SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "Le disque de démarrage ne prend pas en charge la version actuelle %s, seule la version DoM est prise en charge."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 21:50+0800\n"
"Last-Translator: Anda Toshiki <hello@toshiki.dev>\n"
"Language-Team: Toshiki's Devpedia <hello@toshiki.dev>\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "ネットワークデバイスが見つかりません! ネットワークに接続した後、init.sh を再実行してください。"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "ローダーディスクはUSBでもSATA/SCSI/NVME/MMC/XEN DoMでもありません"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "ブートディスクは現在の%sをサポートしていません。現在、%s DoMのみがサポートされています。"
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 21:52+0800\n"
"Last-Translator: EXP <jeong1986>\n"
"Language-Team: 한국인 (대한민국) <EXP>\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "네트워크 장치를 찾을 수 없습니다! 네트워크 연결 후 init.sh를 다시 실행해주세요!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "부팅 디스크는 USB 또는 SATA/SCSI/NVME/MMC/XEN DoM만 지원됩니다"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "부팅 디스크는 현재 %s를 지원하지 않습니다. %s DoM만 지원합니다."
#: init.sh:133
msgid "Loader disk:"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -164,7 +164,8 @@ msgid ""
msgstr ""
#: init.sh:124
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgid ""
"The boot disk does not support the current %s, only %s DoM is supported."
msgstr ""
#: init.sh:133

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 21:54+0800\n"
"Last-Translator: Alex TG @xpenology_russian\n"
"Language-Team: Русский перевод TG @xpenology_russian\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "Сетевые устройства не найдены! Пожалуйста, запустите init.sh повторно после подключения к сети!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "Загрузочный диск поддерживает только USB или SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "Загрузочный диск не поддерживает текущую %s, поддерживается только %s DoM."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 21:58+0800\n"
"Last-Translator: Ing <AI>\n"
"Language-Team: Thai <https://hosted.weblate.org/projects/rrorg/rr/th/>\n"
@ -155,9 +155,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "ไม่พบอุปกรณ์เครือข่าย กรุณาเชื่อมต่อเครือข่าย และทำการเรียก init.sh ใหม่อีกครั้ง"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "ตัวโหลดดิสก์ทั้ง USB หรือ SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "ดิสก์บูตไม่รองรับ %s, เท่านั้น %s DoM ที่รองรับ"
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 22:01+0800\n"
"Last-Translator: miracozturk <info@miracozturk.com.tr>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/rrorg/rr/tr/>\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "Ağ bağlantısı yapıldıktan sonra init.sh'yi yeniden çalıştırın!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "Yükleyici disk USB veya SATA/SCSI/NVME/MMC/XEN DoM değil"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "%s önyükleyici disk desteklemiyor, sadece %s DoM destekleniyor."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 22:03+0800\n"
"Last-Translator: Ing <AI>\n"
"Language-Team: Ukrainian <https://hosted.weblate.org/projects/rrorg/rr/uk/>\n"
@ -155,9 +155,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "Не знайдено мережевих пристроїв Будь ласка, перейдемо в мережі.sh після підключення до мережі!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "Loader disk neither USB or SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "Завантажувач диска не підтримує поточне %s, лише %s DoM підтримується."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 22:04+0800\n"
"Last-Translator: ngocanhtran <mr.ngocanhtran@gmail.com>\n"
"Language-Team: Vietnamese <https://hosted.weblate.org/projects/rrorg/rr/vi/>\n"
@ -155,9 +155,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "Không tìm thấy thiết bị mạng! Hãy chạy câu lệnh init.sh để hiển thị menu sau khi kết nối mạng thành công!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "Ổ đĩa chứa loader không phải là USB hoặc SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "Ổ đĩa chứa boot không hỗ trợ %s, chỉ hỗ trợ ổ đĩa DoM."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 22:06+0800\n"
"Last-Translator: Ing <wjz304>\n"
"Language-Team: Chinese (simplified) <i18n-zh@RROrg>\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "找不到网络设备! 请在连接到网络后重新执行init.sh!"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "引导磁盘仅支持 USB 或者 SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "引导盘不支持当前 %s, 只支持 %s DoM."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 22:08+0800\n"
"Last-Translator: Ing <wjz304>\n"
"Language-Team: Chinese (HongKong) <i18n-zh@googlegroups.com>\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "找不到網路設備! 請在連接到網絡後重新執行 init.sh !"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "引導磁碟僅支持 USB 或者 SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "引導盤不支持當前 %s, 僅支援 %s DoM."
#: init.sh:133
msgid "Loader disk:"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: RR\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-06 09:39+0800\n"
"POT-Creation-Date: 2024-08-08 11:23+0800\n"
"PO-Revision-Date: 2024-05-05 22:10+0800\n"
"Last-Translator: March Fun <https://cyber.suma.tw/>\n"
"Language-Team: Chinese (Taiwan) <https://cyber.suma.tw/>\n"
@ -154,9 +154,8 @@ msgid "Network devices not found! Please re execute init.sh after connecting to
msgstr "未找到網路裝置 ! 連接網路後請重新執行 init.sh !"
#: init.sh:124
#, fuzzy
msgid "Loader disk neither USB or SATA/SCSI/NVME/MMC/IDE/VMBUS/XEN DoM"
msgstr "開機碟僅支援 USB 或者 SATA/SCSI/NVME/MMC/XEN DoM"
msgid "The boot disk does not support the current %s, only %s DoM is supported."
msgstr "開機碟不支援當前 %s只支援 %s DoM。"
#: init.sh:133
msgid "Loader disk:"