diff --git a/initrd/bin/oem-system-info-xx30 b/initrd/bin/oem-system-info-xx30 index fc98f092..a76a0eff 100755 --- a/initrd/bin/oem-system-info-xx30 +++ b/initrd/bin/oem-system-info-xx30 @@ -12,11 +12,13 @@ export BG_COLOR_MAIN_MENU="normal" TRACE_FUNC -battery_charge="$(print_battery_charge)" -battery_health="$(print_battery_health)" -if [ -n "$battery_charge" ] && [ -n "$battery_health" ]; then - battery_status="\nBattery charge: $battery_charge% Battery health: $battery_health%\n" -fi +battery_status="" +for battery in /sys/class/power_supply/BAT*; do + if [[ -d "${battery}" ]]; then + battery_status+="$(awk '{printf "\\nBattery %s charge: %s%%\\nBattery %s health: %s%%", substr($1,4), $2, substr($1,4), $3}' <<< "$(print_battery_state "${battery}")")" + fi +done +battery_status="${battery_status:+${battery_status}\n}" usb="$(lsusb)" pci="$(lspci)"