diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2011-10-02 22:16:11 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2011-10-02 22:16:11 +0200 |
| commit | ecb5cc2be5527e84ae29239ec8fa789c3ee8587e (patch) | |
| tree | 4c7c59827ea325c1999daa9160877b764c079756 /backend | |
| parent | 17dd2d0281bf750768bb9820a677806980380c10 (diff) | |
| download | acritoxinstaller-ecb5cc2be5527e84ae29239ec8fa789c3ee8587e.zip acritoxinstaller-ecb5cc2be5527e84ae29239ec8fa789c3ee8587e.tar.gz | |
use ListItems with formatted size info in frontend
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/modules/bootloader | 10 | ||||
| -rw-r--r-- | backend/modules/partitions | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/backend/modules/bootloader b/backend/modules/bootloader index 3621341..2180873 100644 --- a/backend/modules/bootloader +++ b/backend/modules/bootloader @@ -4,14 +4,14 @@ # # This function lists all disks and the root-partition if it is suitable to install a bootloader on it. # Output example: -# /dev/sda:MBR:250059350016 -# /dev/sdb:MBR:400088457216 -# /dev/sdb1:Rootpartition:60003385344 +# /dev/sda 250059350016 Master Boot Record +# /dev/sdb 400088457216 Master Boot Record +# /dev/sdb1 60003385344 Rootpartition (filesysem ext4) function list_bootloader_targets() { for disk in $(list_all_disks) do - echo "$disk - MBR $(blockdev --getsize64 $disk)" + echo "$disk $(blockdev --getsize64 $disk) Master Boot Record" done root_dev="$(hdmap_get device of mountpoint /)" root_fs="$(hdmap_get filesystem of mountpoint /)" @@ -19,7 +19,7 @@ function list_bootloader_targets() case $root_fs in reiserfs|ext2|ext3|ext4) list_linux_partitions | grep -q "^$root_dev$" && - echo "$root_dev - Rootpartition $(blockdev --getsize64 $root_dev)" + echo "$root_dev $(blockdev --getsize64 $root_dev) Rootpartition (filesystem $root_fs)" ;; esac } diff --git a/backend/modules/partitions b/backend/modules/partitions index 211fdba..a64306a 100644 --- a/backend/modules/partitions +++ b/backend/modules/partitions @@ -93,7 +93,7 @@ function partitions_size_details() while read part x do [ -e "$part" ] || continue - echo "$part $(blockdev --getsize64 "$part")" + echo "$part $(blockdev --getsize64 "$part") $x" done } @@ -229,15 +229,15 @@ function list_possible_root_partitions() # Synopsis: send_possible_root_partitions # -# This script sends a list of all possible root-partitions with size-details to the frontend. +# This script sends a list of all possible root-partitions with size- and usage-details to the frontend. # Output example: # <installer data> possible_root_partitions -# /dev/sda4 10001908224 -# /dev/sdb1 64023257088 +# /dev/sda4 10001908224 filesystem ext3 +# /dev/sdb1 64023257088 function send_possible_root_partitions() { send data possible_root_partitions - list_possible_root_partitions | partitions_size_details + list_possible_root_partitions | partitions_usage_details | partitions_size_details } # Synopsis: send_possible_root_filesystems |